Remove CPU monitor from WebRtcVideoEngine2.

CPU adaptation is based on timings done inside webrtc, not actual CPU
values anymore. This code has never been wired up and is causing flakes
on at least valgrind, but possibly also on actual platforms.

BUG=1788
R=stefan@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8221}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8221 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index d77db23..22285d7 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -330,7 +330,6 @@
                             FPS_TO_INTERVAL(kDefaultVideoMaxFramerate),
                             FOURCC_ANY),
       initialized_(false),
-      cpu_monitor_(new rtc::CpuMonitor(NULL)),
       call_factory_(&default_call_factory_),
       external_decoder_factory_(NULL),
       external_encoder_factory_(NULL) {
@@ -362,12 +361,6 @@
   worker_thread_ = worker_thread;
   ASSERT(worker_thread_ != NULL);
 
-  cpu_monitor_->set_thread(worker_thread_);
-  if (!cpu_monitor_->Start(kCpuMonitorPeriodMs)) {
-    LOG(LS_ERROR) << "Failed to start CPU monitor.";
-    cpu_monitor_.reset();
-  }
-
   initialized_ = true;
   return true;
 }
@@ -375,9 +368,6 @@
 void WebRtcVideoEngine2::Terminate() {
   LOG(LS_INFO) << "WebRtcVideoEngine2::Terminate";
 
-  if (cpu_monitor_.get() != NULL)
-    cpu_monitor_->Stop();
-
   initialized_ = false;
 }
 
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index bb23659..7247c13 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -157,8 +157,6 @@
 
   VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
 
-  rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
-
  private:
   std::vector<VideoCodec> GetSupportedCodecs() const;
 
@@ -170,8 +168,6 @@
 
   bool initialized_;
 
-  rtc::scoped_ptr<rtc::CpuMonitor> cpu_monitor_;
-
   WebRtcCallFactory default_call_factory_;
   WebRtcCallFactory* call_factory_;