| Index: remoting/protocol/fake_connection_to_client.cc
|
| diff --git a/remoting/protocol/fake_connection_to_client.cc b/remoting/protocol/fake_connection_to_client.cc
|
| index 113ecb266e7f3219e585813fed296ebe5a101e46..8d115f5a38255e8fa32987b77eb747464fe04861 100644
|
| --- a/remoting/protocol/fake_connection_to_client.cc
|
| +++ b/remoting/protocol/fake_connection_to_client.cc
|
| @@ -31,7 +31,7 @@ base::WeakPtr<FakeVideoStream> FakeVideoStream::GetWeakPtr() {
|
| return weak_factory_.GetWeakPtr();
|
| }
|
|
|
| -FakeConnectionToClient::FakeConnectionToClient(scoped_ptr<Session> session)
|
| +FakeConnectionToClient::FakeConnectionToClient(std::unique_ptr<Session> session)
|
| : session_(std::move(session)) {}
|
|
|
| FakeConnectionToClient::~FakeConnectionToClient() {}
|
| @@ -40,9 +40,9 @@ void FakeConnectionToClient::SetEventHandler(EventHandler* event_handler) {
|
| event_handler_ = event_handler;
|
| }
|
|
|
| -scoped_ptr<VideoStream> FakeConnectionToClient::StartVideoStream(
|
| - scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) {
|
| - scoped_ptr<FakeVideoStream> result(new FakeVideoStream());
|
| +std::unique_ptr<VideoStream> FakeConnectionToClient::StartVideoStream(
|
| + std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) {
|
| + std::unique_ptr<FakeVideoStream> result(new FakeVideoStream());
|
| last_video_stream_ = result->GetWeakPtr();
|
| return std::move(result);
|
| }
|
|
|