diff --git a/media/webrtc/signaling/gtest/MockCall.h b/media/webrtc/signaling/gtest/MockCall.h
index 4d5c778413db..ba05e6cfc412 100644
--- a/media/webrtc/signaling/gtest/MockCall.h
+++ b/media/webrtc/signaling/gtest/MockCall.h
@@ -69,11 +69,6 @@ public:
   void SetSource(rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
                  const DegradationPreference& degradation_preference) override {}
 
-  CPULoadStateObserver* LoadStateObserver() override
-  {
-    return nullptr;
-  }
-
   void ReconfigureVideoEncoder(VideoEncoderConfig config) override
   {
     mEncoderConfig = config.Copy();
diff --git a/media/webrtc/trunk/webrtc/call/video_send_stream.h b/media/webrtc/trunk/webrtc/call/video_send_stream.h
index b8a83e18c8a1..6ceecda75b3c 100644
--- a/media/webrtc/trunk/webrtc/call/video_send_stream.h
+++ b/media/webrtc/trunk/webrtc/call/video_send_stream.h
@@ -265,10 +265,6 @@ class VideoSendStream {
       rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
       const DegradationPreference& degradation_preference) = 0;
 
-  // Gets interface used to signal the current CPU work level to the encoder.
-  // Valid as long as the VideoSendStream is valid.
-  virtual CPULoadStateObserver* LoadStateObserver() = 0;
-
   // Set which streams to send. Must have at least as many SSRCs as configured
   // in the config. Encoder settings are passed on to the encoder instance along
   // with the VideoStream settings.
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/include/video_coding.h b/media/webrtc/trunk/webrtc/modules/video_coding/include/video_coding.h
index d37557d41702..d633153d55b4 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/include/video_coding.h
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/include/video_coding.h
@@ -409,9 +409,6 @@ class VideoCodingModule : public Module {
   // Setting a desired delay to the VCM receiver. Video rendering will be
   // delayed by at least desired_delay_ms.
   virtual int SetMinReceiverDelay(int desired_delay_ms) = 0;
- 
-  // Set current load state of the CPU
-  virtual void SetCPULoadState(CPULoadState state) = 0;
 
   virtual void RegisterPostEncodeImageCallback(
       EncodedImageCallback* post_encode_callback) = 0;
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/media_optimization.cc b/media/webrtc/trunk/webrtc/modules/video_coding/media_optimization.cc
index 03f63a732412..4b8cc489ccb9 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/media_optimization.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/media_optimization.cc
@@ -149,12 +149,5 @@ void MediaOptimization::ProcessIncomingFrameRate(int64_t now) {
   }
 }
 
-/* TODO: Fix CpuLoadState
-void MediaOptimization::SetCPULoadState(CPULoadState state) {
-    CriticalSectionScoped lock(crit_sect_.get());
-    loadstate_ = state;
-}
-*/
-
 }  // namespace media_optimization
 }  // namespace webrtc
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.cc b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.cc
index e41002caa87e..0bc770beaf5d 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.cc
@@ -242,12 +242,6 @@ class VideoCodingModuleImpl : public VideoCodingModule {
     return receiver_.SetDecodeErrorMode(decode_error_mode);
   }
 
-  virtual void SetCPULoadState(CPULoadState state) override {
-    /* TODO: fix CPULoadState stuff...
-    return sender_.SetCPULoadState(state);
-    */
-  }
-
   int SetMinReceiverDelay(int desired_delay_ms) override {
     return receiver_.SetMinReceiverDelay(desired_delay_ms);
   }
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.h b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.h
index 37951b80477b..0359dd9a5834 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.h
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_impl.h
@@ -185,8 +185,6 @@ class VideoReceiver : public Module {
   int32_t SetReceiveChannelParameters(int64_t rtt);
   int32_t SetVideoProtection(VCMVideoProtection videoProtection, bool enable);
 
-  void SetCPULoadState(CPULoadState state);
-
   int64_t TimeUntilNextProcess() override;
   void Process() override;
 
diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/video_sender.cc b/media/webrtc/trunk/webrtc/modules/video_coding/video_sender.cc
index c15faacccfd2..3487b1b3d7b1 100644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/video_sender.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/video_sender.cc
@@ -393,11 +393,5 @@ int32_t VideoSender::EnableFrameDropper(bool enable) {
   return VCM_OK;
 }
 
-/* TODO: Fixup SetCPULoadState
-void VideoSender::SetCPULoadState(CPULoadState state) {
-  rtc::CritScope lock(&encoder_crit_);
-  _mediaOpt.SetCPULoadState(state);
-}
-*/
 }  // namespace vcm
 }  // namespace webrtc
diff --git a/media/webrtc/trunk/webrtc/video/video_send_stream.cc b/media/webrtc/trunk/webrtc/video/video_send_stream.cc
index d7cc75714d72..765a09685738 100644
--- a/media/webrtc/trunk/webrtc/video/video_send_stream.cc
+++ b/media/webrtc/trunk/webrtc/video/video_send_stream.cc
@@ -595,11 +595,6 @@ VideoSendStream::~VideoSendStream() {
   RTC_DCHECK(!send_stream_);
 }
 
-CPULoadStateObserver* VideoSendStream::LoadStateObserver() {
-  //TODO: figure out CPULoadStateObserver stuff
-  return nullptr;
-}
-
 void VideoSendStream::Start() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   RTC_LOG(LS_INFO) << "VideoSendStream::Start";
diff --git a/media/webrtc/trunk/webrtc/video/video_send_stream.h b/media/webrtc/trunk/webrtc/video/video_send_stream.h
index 4a7c225203f5..998250cd6e44 100644
--- a/media/webrtc/trunk/webrtc/video/video_send_stream.h
+++ b/media/webrtc/trunk/webrtc/video/video_send_stream.h
@@ -74,8 +74,6 @@ class VideoSendStream : public webrtc::VideoSendStream {
   void SetSource(rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
                  const DegradationPreference& degradation_preference) override;
 
-  CPULoadStateObserver* LoadStateObserver() override;
-
   void ReconfigureVideoEncoder(VideoEncoderConfig) override;
   Stats GetStats() override;