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

Screen capturers have been moved to webrtc. This change 
switches chromoting and getUserMedia() to the new copy of the 
capturers in webrtc and removes old copy from media.

TBR=jschuh@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15692018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204966 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc
index 663c08d..a29d727 100644
--- a/remoting/host/sas_injector_win.cc
+++ b/remoting/host/sas_injector_win.cc
@@ -14,8 +14,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.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 "third_party/webrtc/modules/desktop_capture/win/desktop.h"
+#include "third_party/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
 
 namespace remoting {
 
@@ -190,16 +190,16 @@ bool SasInjectorXp::InjectSas() {
   const wchar_t kSasWindowClassName[] = L"SAS window class";
   const wchar_t kSasWindowTitle[] = L"SAS window";
 
-  scoped_ptr<media::Desktop> winlogon_desktop(
-      media::Desktop::GetDesktop(kWinlogonDesktopName));
+  scoped_ptr<webrtc::Desktop> winlogon_desktop(
+      webrtc::Desktop::GetDesktop(kWinlogonDesktopName));
   if (!winlogon_desktop.get()) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to open '" << kWinlogonDesktopName << "' desktop";
     return false;
   }
 
-  media::ScopedThreadDesktop desktop;
-  if (!desktop.SetThreadDesktop(winlogon_desktop.Pass())) {
+  webrtc::ScopedThreadDesktop desktop;
+  if (!desktop.SetThreadDesktop(winlogon_desktop.release())) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to switch to '" << kWinlogonDesktopName << "' desktop";
     return false;