libjingle roll 117:119

content/renderer/media/mock_media_stream_dependency_factory.cc

 // 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.
 
 #include "base/logging.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_peer_connection_impl.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
 template <class TrackType>
 class MockMediaStreamTrackList
     : public MediaStreamTrackListInterface<TrackType> {
  public:
-  virtual size_t count() OVERRIDE {
+  virtual size_t count() const OVERRIDE {
     return tracks_.size();
   }
   virtual TrackType* at(size_t index) OVERRIDE {
     return tracks_[index];
   }
   void AddTrack(TrackType* track) {
     tracks_.push_back(track);
   }
 
  protected:
@@ skipping 21 matching lines @@
     video_tracks_->AddTrack(track);
     return true;
   }
   virtual std::string label() const OVERRIDE { return label_; }
   virtual AudioTracks* audio_tracks() OVERRIDE {
     return audio_tracks_;
   }
   virtual VideoTracks* video_tracks() OVERRIDE {
     return video_tracks_;
   }
-  virtual ReadyState ready_state() OVERRIDE {
+  virtual ReadyState ready_state() const OVERRIDE {
     NOTIMPLEMENTED();
     return kInitializing;
   }
   virtual void set_ready_state(ReadyState state) OVERRIDE { NOTIMPLEMENTED(); }
   virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
   virtual void UnregisterObserver(ObserverInterface* observer) {
     NOTIMPLEMENTED();
   }
@@ skipping 80 matching lines @@
 }
 
 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
 MockMediaStreamDependencyFactory::CreatePeerConnection(
     const std::string& config,
     webrtc::PeerConnectionObserver* observer) {
   DCHECK(mock_pc_factory_created_);
   return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>();
 }
 
+talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
+MockMediaStreamDependencyFactory::CreateRoapPeerConnection(
+    const std::string& config,
+    webrtc::PeerConnectionObserver* observer) {
+  DCHECK(mock_pc_factory_created_);
+  return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>();
+}
+
 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
 MockMediaStreamDependencyFactory::CreateLocalMediaStream(
     const std::string& label) {
   talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream(
       new talk_base::RefCountedObject<webrtc::MockLocalMediaStream>(label));
   return stream;
 }
 
 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
 MockMediaStreamDependencyFactory::CreateLocalVideoTrack(
     const std::string& label,
     cricket::VideoCapturer* video_device) {
   talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> stream(
       new talk_base::RefCountedObject<webrtc::MockLocalVideoTrack>(label));
   return stream;
 }
 
 talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
 MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
     const std::string& label,
     webrtc::AudioDeviceModule* audio_device) {
   NOTIMPLEMENTED();
   return NULL;
 }