Remove screen capturers from media/video/capture/screen.

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 490ef90a1b10b194d8403acec03e4b9e8e2bdc51..581f2c10a7201b1ebc7519e59751bbdd57f9eb5d 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -320,9 +320,11 @@ void DesktopSessionAgent::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
 }
 
 void DesktopSessionAgent::OnCursorShapeChanged(
-    scoped_ptr<media::MouseCursorShape> cursor_shape) {
+    webrtc::MouseCursorShape* cursor_shape) {
   DCHECK(video_capture_task_runner_->BelongsToCurrentThread());
 
+  scoped_ptr<webrtc::MouseCursorShape> owned_cursor(cursor_shape);
+
   SendToNetwork(new ChromotingDesktopNetworkMsg_CursorShapeChanged(
       *cursor_shape));
 }
@@ -412,11 +414,11 @@ void DesktopSessionAgent::OnCaptureFrame() {
     return;
   }
 
-  // media::ScreenCapturer supports a very few (currently 2) outstanding capture
-  // requests. The requests are serialized on |video_capture_task_runner()| task
-  // runner. If the client issues more requests, pixel data in captured frames
-  // will likely be corrupted but stability of media::ScreenCapturer will not be
-  // affected.
+  // webrtc::ScreenCapturer supports a very few (currently 2) outstanding
+  // capture requests. The requests are serialized on
+  // |video_capture_task_runner()| task runner. If the client issues more
+  // requests, pixel data in captured frames will likely be corrupted but
+  // stability of webrtc::ScreenCapturer will not be affected.
   video_capturer_->Capture(webrtc::DesktopRegion());
 }