Remove references of ScreenCapturer and WindowCapturer

webrtc/modules/desktop_capture/cropping_window_capturer.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/desktop_capture/cropping_window_capturer.h"
 
 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h"
 #include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {
 
 CroppingWindowCapturer::CroppingWindowCapturer(
     const DesktopCaptureOptions& options)
     : options_(options),
       callback_(NULL),
-      window_capturer_(WindowCapturer::Create(options)),
+      window_capturer_(DesktopCapturer::CreateRawWindowCapturer(options)),
       selected_window_(kNullWindowId),
       excluded_window_(kNullWindowId) {
 }
 
 CroppingWindowCapturer::~CroppingWindowCapturer() {}
 
 void CroppingWindowCapturer::Start(DesktopCapturer::Callback* callback) {
   callback_ = callback;
   window_capturer_->Start(callback);
 }
 
 void CroppingWindowCapturer::SetSharedMemoryFactory(
     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) {
   window_capturer_->SetSharedMemoryFactory(std::move(shared_memory_factory));
 }
 
 void CroppingWindowCapturer::CaptureFrame() {
   if (ShouldUseScreenCapturer()) {
     if (!screen_capturer_.get()) {
-      screen_capturer_.reset(ScreenCapturer::Create(options_));
+      screen_capturer_ = DesktopCapturer::CreateRawScreenCapturer(options_);
       if (excluded_window_) {
         screen_capturer_->SetExcludedWindow(excluded_window_);
       }
       screen_capturer_->Start(this);
     }
     screen_capturer_->CaptureFrame();
   } else {
     window_capturer_->CaptureFrame();
   }
 }
@@ skipping 50 matching lines @@
 
 #if !defined(WEBRTC_WIN)
 // static
 WindowCapturer*
 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) {
   return WindowCapturer::Create(options);
 }
 #endif
 
 }  // namespace webrtc