From 24d448561403358d32958628a5ef54b1cd416857 Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@webrtc.org>
Date: Thu, 23 Apr 2015 14:51:18 +0200
Subject: [PATCH] Enable -Wunused-private-field warning for talk/

BUG=4242
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49139004

Cr-Commit-Position: refs/heads/master@{#9069}
---
 talk/build/common.gypi                       |  3 ++
 talk/media/webrtc/webrtcpassthroughrender.cc |  8 +---
 talk/media/webrtc/webrtcvideoengine.cc       | 41 +++++++-------------
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index d7c6881575..2d6fca0949 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -91,6 +91,9 @@
               '-Wno-address-of-array-temporary',
               '-Wthread-safety',
             ],
+            'cflags_cc': [
+              '-Wunused-private-field',
+            ],
           }],
         ],
       }],
diff --git a/talk/media/webrtc/webrtcpassthroughrender.cc b/talk/media/webrtc/webrtcpassthroughrender.cc
index 179dd110b2..89772884c9 100644
--- a/talk/media/webrtc/webrtcpassthroughrender.cc
+++ b/talk/media/webrtc/webrtcpassthroughrender.cc
@@ -37,10 +37,7 @@ namespace cricket {
 
 class PassthroughStream: public webrtc::VideoRenderCallback {
  public:
-  explicit PassthroughStream(const uint32_t stream_id)
-      : stream_id_(stream_id),
-        running_(false) {
-  }
+  PassthroughStream() : running_(false) {}
   virtual ~PassthroughStream() {
   }
   virtual int32_t RenderFrame(const uint32_t stream_id,
@@ -71,7 +68,6 @@ class PassthroughStream: public webrtc::VideoRenderCallback {
   }
 
  private:
-  uint32_t stream_id_;
   VideoRenderCallback* renderer_;
   rtc::CriticalSection stream_critical_;
   bool running_;
@@ -102,7 +98,7 @@ webrtc::VideoRenderCallback* WebRtcPassthroughRender::AddIncomingRenderStream(
     return NULL;
   }
 
-  PassthroughStream* stream = new PassthroughStream(stream_id);
+  PassthroughStream* stream = new PassthroughStream();
   // Store the stream
   stream_render_map_[stream_id] = stream;
   return stream;
diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index da40738b07..5c41c438b9 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -464,18 +464,16 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer {
 
 class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
  public:
-  explicit WebRtcDecoderObserver(int video_channel_id)
-       : video_channel_id_(video_channel_id),
-         framerate_(0),
-         bitrate_(0),
-         decode_ms_(0),
-         max_decode_ms_(0),
-         current_delay_ms_(0),
-         target_delay_ms_(0),
-         jitter_buffer_ms_(0),
-         min_playout_delay_ms_(0),
-         render_delay_ms_(0) {
-  }
+  explicit WebRtcDecoderObserver()
+      : framerate_(0),
+        bitrate_(0),
+        decode_ms_(0),
+        max_decode_ms_(0),
+        current_delay_ms_(0),
+        target_delay_ms_(0),
+        jitter_buffer_ms_(0),
+        min_playout_delay_ms_(0),
+        render_delay_ms_(0) {}
 
   // virtual functions from VieDecoderObserver.
   virtual void IncomingCodecChanged(const int video_channel_id,
@@ -484,7 +482,6 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
                             const unsigned int framerate,
                             const unsigned int bitrate) {
     rtc::CritScope cs(&crit_);
-    ASSERT(video_channel_id_ == video_channel_id);
     framerate_ = framerate;
     bitrate_ = bitrate;
   }
@@ -523,7 +520,6 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
 
  private:
   mutable rtc::CriticalSection crit_;
-  int video_channel_id_;
   int framerate_;
   int bitrate_;
   int decode_ms_;
@@ -537,26 +533,20 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
 
 class WebRtcEncoderObserver : public webrtc::ViEEncoderObserver {
  public:
-  explicit WebRtcEncoderObserver(int video_channel_id)
-      : video_channel_id_(video_channel_id),
-        framerate_(0),
-        bitrate_(0),
-        suspended_(false) {
-  }
+  explicit WebRtcEncoderObserver()
+      : framerate_(0), bitrate_(0), suspended_(false) {}
 
   // virtual functions from VieEncoderObserver.
   virtual void OutgoingRate(const int video_channel_id,
                             const unsigned int framerate,
                             const unsigned int bitrate) {
     rtc::CritScope cs(&crit_);
-    ASSERT(video_channel_id_ == video_channel_id);
     framerate_ = framerate;
     bitrate_ = bitrate;
   }
 
   virtual void SuspendChange(int video_channel_id, bool is_suspended) {
     rtc::CritScope cs(&crit_);
-    ASSERT(video_channel_id_ == video_channel_id);
     suspended_ = is_suspended;
   }
 
@@ -575,7 +565,6 @@ class WebRtcEncoderObserver : public webrtc::ViEEncoderObserver {
 
  private:
   mutable rtc::CriticalSection crit_;
-  int video_channel_id_;
   int framerate_;
   int bitrate_;
   bool suspended_;
@@ -642,10 +631,7 @@ class WebRtcVideoChannelRecvInfo  {
  public:
   typedef std::map<int, webrtc::VideoDecoder*> DecoderMap;  // Key: payload type
   explicit WebRtcVideoChannelRecvInfo(int channel_id)
-      : channel_id_(channel_id),
-        render_adapter_(NULL, channel_id),
-        decoder_observer_(channel_id) {
-  }
+      : channel_id_(channel_id), render_adapter_(NULL, channel_id) {}
   int channel_id() { return channel_id_; }
   void SetRenderer(VideoRenderer* renderer) {
     render_adapter_.SetRenderer(renderer);
@@ -737,7 +723,6 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
         sending_(false),
         muted_(false),
         video_capturer_(NULL),
-        encoder_observer_(channel_id),
         external_capture_(external_capture),
         cpu_monitor_(cpu_monitor),
         old_adaptation_changes_(0),