Update libjingle 273:277.

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 content {
 
 class MockVideoSource : public webrtc::VideoSourceInterface {
  public:
   MockVideoSource();
 
   virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
   virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
   virtual MediaSourceInterface::SourceState state() const OVERRIDE;
   virtual cricket::VideoCapturer* GetVideoCapturer() OVERRIDE;
   virtual void AddSink(cricket::VideoRenderer* output) OVERRIDE;
   virtual void RemoveSink(cricket::VideoRenderer* output) OVERRIDE;
+  virtual const cricket::VideoOptions* options() const OVERRIDE;
 
   // Changes the state of the source to live and notifies the observer.
   void SetLive();
   // Changes the state of the source to ended and notifies the observer.
   void SetEnded();
 
  protected:
   virtual ~MockVideoSource();
 
  private:
@@ skipping 111 matching lines @@
   virtual scoped_refptr<webrtc::LocalMediaStreamInterface>
       CreateLocalMediaStream(const std::string& label) OVERRIDE;
   virtual scoped_refptr<webrtc::VideoTrackInterface>
       CreateLocalVideoTrack(const std::string& id,
                             webrtc::VideoSourceInterface* source) OVERRIDE;
   virtual scoped_refptr<webrtc::LocalAudioTrackInterface>
       CreateLocalAudioTrack(const std::string& id,
                             webrtc::AudioSourceInterface* source) OVERRIDE;
   virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
       const std::string& type,
-      const std::string& sdp) OVERRIDE;
+      const std::string& sdp,
+      webrtc::SdpParseError* error) OVERRIDE;
   virtual webrtc::IceCandidateInterface* CreateIceCandidate(
       const std::string& sdp_mid,
       int sdp_mline_index,
       const std::string& sdp) OVERRIDE;
 
   virtual bool EnsurePeerConnectionFactory() OVERRIDE;
   virtual bool PeerConnectionFactoryCreated() OVERRIDE;
 
   MockAudioSource* last_audio_source() { return last_audio_source_; }
   MockVideoSource* last_video_source() { return last_video_source_; }
 
  private:
   bool mock_pc_factory_created_;
   scoped_refptr <MockAudioSource> last_audio_source_;
   scoped_refptr <MockVideoSource> last_video_source_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDependencyFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_