| Index: remoting/host/basic_desktop_environment.cc
|
| diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
|
| index f821d593d41818dfaa9252d94880941c2b38a6bf..eb5e9bfea47d9f71d3650f589219ae4f217ee2c0 100644
|
| --- a/remoting/host/basic_desktop_environment.cc
|
| +++ b/remoting/host/basic_desktop_environment.cc
|
| @@ -37,7 +37,7 @@ scoped_ptr<InputInjector> BasicDesktopEnvironment::CreateInputInjector() {
|
| scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() {
|
| DCHECK(caller_task_runner_->BelongsToCurrentThread());
|
|
|
| - return scoped_ptr<ScreenControls>();
|
| + return nullptr;
|
| }
|
|
|
| scoped_ptr<webrtc::MouseCursorMonitor>
|
| @@ -57,7 +57,7 @@ void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
|
|
|
| scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
|
| protocol::ClientStub* client_stub) {
|
| - return scoped_ptr<GnubbyAuthHandler>();
|
| + return nullptr;
|
| }
|
|
|
| scoped_ptr<webrtc::DesktopCapturer>
|
|
|