Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/client_session.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/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "remoting/base/capabilities.h"
@@ skipping 10 matching lines @@
 #include "remoting/host/host_extension_session.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/host/video_scheduler.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 #include "remoting/protocol/pairing_registry.h"
-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
 // Default DPI to assume for old clients that use notifyClientDimensions.
 const int kDefaultDPI = 96;
 
 namespace remoting {
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
@@ skipping 404 matching lines @@
 }
 
 void ClientSession::ResetVideoPipeline() {
   DCHECK(CalledOnValidThread());
 
   if (video_scheduler_.get()) {
     video_scheduler_->Stop();
     video_scheduler_ = NULL;
   }
 
-  // Create VideoEncoder and ScreenCapturer to match the session's video channel
-  // configuration.
-  scoped_ptr<webrtc::ScreenCapturer> video_capturer =
+  // Create VideoEncoder and DesktopCapturer to match the session's video
+  // channel configuration.
+  scoped_ptr<webrtc::DesktopCapturer> video_capturer =
       extension_manager_->OnCreateVideoCapturer(
           desktop_environment_->CreateVideoCapturer());
   scoped_ptr<VideoEncoder> video_encoder =
       extension_manager_->OnCreateVideoEncoder(
           CreateVideoEncoder(connection_->session()->config()));
 
   // Don't start the VideoScheduler if either capturer or encoder are missing.
   if (!video_capturer || !video_encoder)
     return;
 
@@ skipping 59 matching lines @@
     return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
   }
 
   NOTREACHED();
   return scoped_ptr<AudioEncoder>();
 }
 
 }  // namespace remoting