libjingle roll 117:119

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 00c797f1ca1143aa5d0973351ff3d6a12e06c391..f482ce5c07db6ed7db1588c095de02b17669a450 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -43,7 +43,7 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
   VideoRendererWrapperInterface* renderer_;
 };
 
-} //  namespace webrtc
+}  //  namespace webrtc
 
 // A mock factory for creating different objects for MediaStreamImpl.
 class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {
@@ -63,6 +63,10 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {
       CreatePeerConnection(
           const std::string& config,
           webrtc::PeerConnectionObserver* observer) OVERRIDE;
+  virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
+      CreateRoapPeerConnection(
+          const std::string& config,
+          webrtc::PeerConnectionObserver* observer) OVERRIDE;
   virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
       CreateLocalMediaStream(const std::string& label) OVERRIDE;
   virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>