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

remoting/host/win/session_input_injector.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/win/session_input_injector.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/windows_version.h"
-#include "media/video/capture/screen/win/desktop.h"
-#include "media/video/capture/screen/win/scoped_thread_desktop.h"
 #include "remoting/host/sas_injector.h"
 #include "remoting/proto/event.pb.h"
+#include "third_party/webrtc/modules/desktop_capture/win/desktop.h"
+#include "third_party/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
 
 namespace {
 
 const uint32 kUsbLeftControl =  0x0700e0;
 const uint32 kUsbRightControl = 0x0700e4;
 const uint32 kUsbLeftAlt =  0x0700e2;
 const uint32 kUsbRightAlt = 0x0700e6;
 const uint32 kUsbDelete = 0x07004c;
 
 bool CheckCtrlAndAltArePressed(const std::set<uint32>& pressed_keys) {
@@ skipping 43 matching lines @@
   // the current one.
   void SwitchToInputDesktop();
 
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
 
   // Pointer to the next event executor.
   scoped_ptr<InputInjector> nested_executor_;
 
   scoped_refptr<base::SingleThreadTaskRunner> inject_sas_task_runner_;
 
-  media::ScopedThreadDesktop desktop_;
+  webrtc::ScopedThreadDesktop desktop_;
 
   // Used to inject Secure Attention Sequence on Vista+.
   base::Closure inject_sas_;
 
   // Used to inject Secure Attention Sequence on XP.
   scoped_ptr<SasInjector> sas_injector_;
 
   // Keys currently pressed by the client, used to detect Ctrl-Alt-Del.
   std::set<uint32> pressed_keys_;
 
@@ skipping 81 matching lines @@
   SwitchToInputDesktop();
   nested_executor_->InjectMouseEvent(event);
 }
 
 SessionInputInjectorWin::Core::~Core() {
 }
 
 void SessionInputInjectorWin::Core::SwitchToInputDesktop() {
   // Switch to the desktop receiving user input if different from the current
   // one.
-  scoped_ptr<media::Desktop> input_desktop = media::Desktop::GetInputDesktop();
+  scoped_ptr<webrtc::Desktop> input_desktop(
+      webrtc::Desktop::GetInputDesktop());
   if (input_desktop.get() != NULL && !desktop_.IsSame(*input_desktop)) {
     // If SetThreadDesktop() fails, the thread is still assigned a desktop.
     // So we can continue capture screen bits, just from a diffected desktop.
-    desktop_.SetThreadDesktop(input_desktop.Pass());
+    desktop_.SetThreadDesktop(input_desktop.release());
   }
 }
 
 SessionInputInjectorWin::SessionInputInjectorWin(
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_ptr<InputInjector> nested_executor,
     scoped_refptr<base::SingleThreadTaskRunner> inject_sas_task_runner,
     const base::Closure& inject_sas) {
   core_ = new Core(input_task_runner, nested_executor.Pass(),
                    inject_sas_task_runner, inject_sas);
@@ skipping 15 matching lines @@
 void SessionInputInjectorWin::InjectKeyEvent(const protocol::KeyEvent& event) {
   core_->InjectKeyEvent(event);
 }
 
 void SessionInputInjectorWin::InjectMouseEvent(
     const protocol::MouseEvent& event) {
   core_->InjectMouseEvent(event);
 }
 
 }  // namespace remoting