Stop using rtc_make_scoped_ptr

remoting/host/desktop_session_agent.cc

Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 26ee9e1a9d98754daffb3b9e334cd0edbce43c02..84012a3767391294fd8b121c26c8ff031e0c36f2 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -142,7 +142,7 @@ class SharedMemoryFactoryImpl : public webrtc::SharedMemoryFactory {
               buffer->size())));
     }
 
-    return rtc_make_scoped_ptr(buffer.release());
+    return rtc::scoped_ptr<webrtc::SharedMemory>(buffer.release());

[tommi, 2016/04/25 10:24:22]

looks like CreateSharedMemory is only being called from two places and in both
of those places, there's a workaround to translate the return value from
scoped_ptr to std::unique_ptr.  Can we just change the return type and return
buffer here?

[kwiberg-chromium, 2016/04/25 10:41:59]

We could, but changing the return value of an interface function that's used by
WebRTC clients is a multi-step process if we want to give the clients the option
to avoid going through broken states (which we do).

But if we just do what I suggest in this patch set, the problem will go away
naturally, since the WebRTC CL I'm planning to land this week will turn
rtc::scoped pointer into a type alias for std::unique_ptr. After that, what you
asked for (webrtc::SharedMemoryFactory::CreateSharedMemory returning a
std::unique_ptr) will have effectively happened, and call sites such as this one
will be free to just return their unique_ptrs directly. (A simplification that's
actually very likely to happen, given that two weeks later, I'll remove the
rtc::scoped_ptr name entirely, so I'll need to fix all lines that mention it.)

[tommi, 2016/04/25 12:30:26]

ok, sgtm

   }
 
  private:
@@ -310,7 +310,7 @@ void DesktopSessionAgent::OnStartSessionAgent(
   video_capturer_ = desktop_environment_->CreateVideoCapturer();
   video_capturer_->Start(this);
   video_capturer_->SetSharedMemoryFactory(
-      rtc_make_scoped_ptr(new SharedMemoryFactoryImpl(
+      rtc::scoped_ptr<webrtc::SharedMemoryFactory>(new SharedMemoryFactoryImpl(
           base::Bind(&DesktopSessionAgent::SendToNetwork, this))));
   mouse_cursor_monitor_ = desktop_environment_->CreateMouseCursorMonitor();
   mouse_cursor_monitor_->Init(this, webrtc::MouseCursorMonitor::SHAPE_ONLY);