Roll libjingle to r204

content/renderer/media/mock_media_stream_dependency_factory.h

Index: content/renderer/media/mock_media_stream_dependency_factory.h
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
index e4de0dd4b2947758173ebc40931a49d7dcd98f49..a9829bcfb0de629edeff14c0c203f96b3347a691 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -19,7 +19,7 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
     : enabled_(false),
       label_(label) {
   }
-  virtual cricket::VideoCapturer* GetVideoCapture() OVERRIDE;
+  virtual cricket::VideoCapturer* GetVideoCapture();

[Ronghua Wu (Left Chromium), 2012/10/15 16:07:47]

Remove this.

   virtual void AddRenderer(VideoRendererInterface* renderer) OVERRIDE;
   virtual void RemoveRenderer(VideoRendererInterface* renderer) OVERRIDE;
   virtual cricket::VideoRenderer* FrameInput() OVERRIDE;
@@ -31,6 +31,7 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
   virtual bool set_state(TrackState new_state) OVERRIDE;
   virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE;
   virtual void UnregisterObserver(ObserverInterface* observer) OVERRIDE;
+  virtual VideoSourceInterface* GetSource() const OVERRIDE;
 
  protected:
   virtual ~MockLocalVideoTrack() {}
@@ -46,7 +47,7 @@ class MockLocalAudioTrack : public LocalAudioTrackInterface {
     : enabled_(false),
       label_(label) {
   }
-  virtual AudioDeviceModule* GetAudioDevice() OVERRIDE;
+  virtual AudioDeviceModule* GetAudioDevice();

[Ronghua Wu (Left Chromium), 2012/10/15 16:07:47]

Remove this.

   virtual std::string kind() const OVERRIDE;
   virtual std::string label() const OVERRIDE;
   virtual bool enabled() const OVERRIDE;
@@ -55,6 +56,7 @@ class MockLocalAudioTrack : public LocalAudioTrackInterface {
   virtual bool set_state(TrackState new_state) OVERRIDE;
   virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE;
   virtual void UnregisterObserver(ObserverInterface* observer) OVERRIDE;
+  virtual AudioSourceInterface* GetSource() const OVERRIDE;
 
  protected:
   virtual ~MockLocalAudioTrack() {}