Remove overloaded CpuOveruseMeasure function.

R=mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5272 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/video_engine/include/vie_base.h b/webrtc/video_engine/include/vie_base.h
index 0ca3182..cd5f385 100644
--- a/webrtc/video_engine/include/vie_base.h
+++ b/webrtc/video_engine/include/vie_base.h
@@ -131,11 +131,6 @@
   //                               processed. The delay is expressed in ms
   //                               delay per second.
   // TODO(asapersson): Remove default implementation.
-  // TODO(asapersson): Remove this function.
-  virtual int CpuOveruseMeasures(int channel,
-                                 int* capture_jitter_ms,
-                                 int* avg_encode_time_ms) { return -1; }
-
   virtual int CpuOveruseMeasures(int channel,
                                  int* capture_jitter_ms,
                                  int* avg_encode_time_ms,
diff --git a/webrtc/video_engine/vie_base_impl.cc b/webrtc/video_engine/vie_base_impl.cc
index 6198694..83f156d 100644
--- a/webrtc/video_engine/vie_base_impl.cc
+++ b/webrtc/video_engine/vie_base_impl.cc
@@ -119,18 +119,6 @@
 
 int ViEBaseImpl::CpuOveruseMeasures(int video_channel,
                                     int* capture_jitter_ms,
-                                    int* avg_encode_time_ms) {
-  int encode_usage_percent;
-  int capture_queue_delay_ms_per_s;
-  return CpuOveruseMeasures(video_channel,
-                            capture_jitter_ms,
-                            avg_encode_time_ms,
-                            &encode_usage_percent,
-                            &capture_queue_delay_ms_per_s);
-}
-
-int ViEBaseImpl::CpuOveruseMeasures(int video_channel,
-                                    int* capture_jitter_ms,
                                     int* avg_encode_time_ms,
                                     int* encode_usage_percent,
                                     int* capture_queue_delay_ms_per_s) {
diff --git a/webrtc/video_engine/vie_base_impl.h b/webrtc/video_engine/vie_base_impl.h
index 779042b..231efc9 100644
--- a/webrtc/video_engine/vie_base_impl.h
+++ b/webrtc/video_engine/vie_base_impl.h
@@ -35,9 +35,6 @@
                                          CpuOveruseObserver* observer);
   virtual int CpuOveruseMeasures(int channel,
                                  int* capture_jitter_ms,
-                                 int* avg_encode_time_ms);
-  virtual int CpuOveruseMeasures(int channel,
-                                 int* capture_jitter_ms,
                                  int* avg_encode_time_ms,
                                  int* encode_usage_percent,
                                  int* capture_queue_delay_ms_per_s);