Move screen capturers from remoting/capturer to media/video/capturer/screen

remoting/host/ipc_desktop_environment.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/ipc_desktop_environment.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "remoting/capturer/video_frame_capturer.h"
+#include "media/video/capture/screen/screen_capturer.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_proxy.h"
 #include "remoting/host/event_executor.h"
 
 namespace remoting {
 
 IpcDesktopEnvironment::IpcDesktopEnvironment(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     const std::string& client_jid,
@@ skipping 26 matching lines @@
 scoped_ptr<EventExecutor> IpcDesktopEnvironment::CreateEventExecutor(
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   ConnectToDesktopSession();
   return desktop_session_proxy_->CreateEventExecutor(input_task_runner,
                                                      ui_task_runner);
 }
 
-scoped_ptr<VideoFrameCapturer> IpcDesktopEnvironment::CreateVideoCapturer(
+scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer(
     scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   ConnectToDesktopSession();
   return desktop_session_proxy_->CreateVideoCapturer(capture_task_runner,
                                                      encode_task_runner);
 }
 
 void IpcDesktopEnvironment::ConnectToDesktopSession() {
@@ skipping 106 matching lines @@
   if (i != active_connections_.end()) {
     scoped_refptr<DesktopSessionProxy> desktop_session_proxy = i->second;
     active_connections_.erase(i);
 
     // Disconnect the client session.
     desktop_session_proxy->DisconnectSession();
   }
 }
 
 }  // namespace remoting