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

remoting/host/desktop_session_agent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/desktop_session_agent.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "ipc/ipc_channel_proxy.h"
@@ skipping 302 matching lines @@
   for (webrtc::DesktopRegion::Iterator i(frame->updated_region());
        !i.IsAtEnd(); i.Advance()) {
     serialized_frame.dirty_region.push_back(i.rect());
   }
 
   SendToNetwork(
       new ChromotingDesktopNetworkMsg_CaptureCompleted(serialized_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));
 }
 
 void DesktopSessionAgent::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   std::string serialized_event;
   if (!event.SerializeToString(&serialized_event)) {
@@ skipping 69 matching lines @@
 }
 
 void DesktopSessionAgent::OnCaptureFrame() {
   if (!video_capture_task_runner_->BelongsToCurrentThread()) {
     video_capture_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&DesktopSessionAgent::OnCaptureFrame, this));
     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());
 }
 
 void DesktopSessionAgent::OnInjectClipboardEvent(
     const std::string& serialized_event) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   protocol::ClipboardEvent event;
   if (!event.ParseFromString(serialized_event)) {
     LOG(ERROR) << "Failed to parse protocol::ClipboardEvent.";
@@ skipping 114 matching lines @@
     base::ClosePlatformFile(desktop_pipe_.fd);
 #else  // !defined(OS_POSIX)
 #error Unsupported platform.
 #endif  // !defined(OS_POSIX)
 
     desktop_pipe_ = IPC::InvalidPlatformFileForTransit();
   }
 }
 
 }  // namespace remoting