Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/desktop_process_unittest.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/desktop_process.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_process.h"
-#include "remoting/host/fake_screen_capturer.h"
+#include "remoting/host/fake_desktop_capturer.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AnyNumber;
@@ skipping 65 matching lines @@
   virtual ~DesktopProcessTest();
 
   // testing::Test overrides
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // MockDaemonListener mocks
   void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);
   void OnDesktopAttached(IPC::PlatformFileForTransit desktop_process);
 
-  // Creates a DesktopEnvironment with a fake webrtc::ScreenCapturer, to mock
+  // Creates a DesktopEnvironment with a fake webrtc::DesktopCapturer, to mock
   // DesktopEnvironmentFactory::Create().
   DesktopEnvironment* CreateDesktopEnvironment();
 
   // Creates a dummy InputInjector, to mock
   // DesktopEnvironment::CreateInputInjector().
   InputInjector* CreateInputInjector();
 
-  // Creates a fake webrtc::ScreenCapturer, to mock
+  // Creates a fake webrtc::DesktopCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
-  webrtc::ScreenCapturer* CreateVideoCapturer();
+  webrtc::DesktopCapturer* CreateVideoCapturer();
 
   // Disconnects the daemon-to-desktop channel causing the desktop process to
   // exit.
   void DisconnectChannels();
 
   // Posts DisconnectChannels() to |message_loop_|.
   void PostDisconnectChannels();
 
   // Runs the desktop process code in a separate thread.
   void RunDesktopProcess();
@@ skipping 82 matching lines @@
   network_listener_.OnDesktopEnvironmentCreated();
   return desktop_environment;
 }
 
 InputInjector* DesktopProcessTest::CreateInputInjector() {
   MockInputInjector* input_injector = new MockInputInjector();
   EXPECT_CALL(*input_injector, StartPtr(_));
   return input_injector;
 }
 
-webrtc::ScreenCapturer* DesktopProcessTest::CreateVideoCapturer() {
-  return new FakeScreenCapturer();
+webrtc::DesktopCapturer* DesktopProcessTest::CreateVideoCapturer() {
+  return new FakeDesktopCapturer();
 }
 
 void DesktopProcessTest::DisconnectChannels() {
   daemon_channel_.reset();
   network_channel_.reset();
   io_task_runner_ = NULL;
 }
 
 void DesktopProcessTest::PostDisconnectChannels() {
   message_loop_.PostTask(FROM_HERE, base::Bind(
@@ skipping 104 matching lines @@
 }
 
 // Run the desktop process and ask it to crash.
 TEST_F(DesktopProcessTest, DeathTest) {
   testing::GTEST_FLAG(death_test_style) = "threadsafe";
 
   EXPECT_DEATH(RunDeathTest(), "");
 }
 
 }  // namespace remoting