| Index: content/renderer/media/mock_peer_connection_impl.h
|
| diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
|
| index 0d7a8477ca373e4abdae257ddf0fa87dff06d9c0..d563746aeed5e7f236787f031fa0fff89ce682a0 100644
|
| --- a/content/renderer/media/mock_peer_connection_impl.h
|
| +++ b/content/renderer/media/mock_peer_connection_impl.h
|
| @@ -24,18 +24,18 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
|
| explicit MockPeerConnectionImpl(MockPeerConnectionDependencyFactory* factory);
|
|
|
| // PeerConnectionInterface implementation.
|
| - virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface>
|
| + virtual talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
|
| local_streams() OVERRIDE;
|
| - virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface>
|
| + virtual talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
|
| remote_streams() OVERRIDE;
|
| virtual bool AddStream(
|
| webrtc::MediaStreamInterface* local_stream,
|
| const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;
|
| virtual void RemoveStream(
|
| webrtc::MediaStreamInterface* local_stream) OVERRIDE;
|
| - virtual rtc::scoped_refptr<webrtc::DtmfSenderInterface>
|
| + virtual talk_base::scoped_refptr<webrtc::DtmfSenderInterface>
|
| CreateDtmfSender(webrtc::AudioTrackInterface* track) OVERRIDE;
|
| - virtual rtc::scoped_refptr<webrtc::DataChannelInterface>
|
| + virtual talk_base::scoped_refptr<webrtc::DataChannelInterface>
|
| CreateDataChannel(const std::string& label,
|
| const webrtc::DataChannelInit* config) OVERRIDE;
|
|
|
| @@ -124,8 +124,8 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
|
| MockPeerConnectionDependencyFactory* dependency_factory_;
|
|
|
| std::string stream_label_;
|
| - rtc::scoped_refptr<MockStreamCollection> local_streams_;
|
| - rtc::scoped_refptr<MockStreamCollection> remote_streams_;
|
| + talk_base::scoped_refptr<MockStreamCollection> local_streams_;
|
| + talk_base::scoped_refptr<MockStreamCollection> remote_streams_;
|
| scoped_ptr<webrtc::SessionDescriptionInterface> local_desc_;
|
| scoped_ptr<webrtc::SessionDescriptionInterface> remote_desc_;
|
| scoped_ptr<webrtc::SessionDescriptionInterface> created_sessiondescription_;
|
|
|