Roll libjingle to r204

content/renderer/media/mock_media_stream_dependency_factory.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 
 namespace webrtc {
 
 class MockLocalVideoTrack : public LocalVideoTrackInterface {
  public:
   explicit MockLocalVideoTrack(std::string label)
     : 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;
   virtual std::string kind() const OVERRIDE;
   virtual std::string label() const OVERRIDE;
   virtual bool enabled() const OVERRIDE;
   virtual TrackState state() const OVERRIDE;
   virtual bool set_enabled(bool enable) OVERRIDE;
   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() {}
 
  private:
   bool enabled_;
   std::string label_;
 };
 
 class MockLocalAudioTrack : public LocalAudioTrackInterface {
  public:
   explicit MockLocalAudioTrack(const std::string& label)
     : 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;
   virtual TrackState state() const OVERRIDE;
   virtual bool set_enabled(bool enable) OVERRIDE;
   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() {}
 
  private:
   bool enabled_;
   std::string label_;
 };
 
 }  //  namespace webrtc
@@ skipping 34 matching lines @@
   virtual bool EnsurePeerConnectionFactory() OVERRIDE;
   virtual void SetAudioDeviceSessionId(int session_id) OVERRIDE;
 
  private:
   bool mock_pc_factory_created_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDependencyFactory);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_