Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/chromoting_host_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/fake_desktop_capturer.h"
 #include "remoting/host/fake_mouse_cursor_monitor.h"
-#include "remoting/host/fake_screen_capturer.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 203 matching lines @@
     // Make sure that the host has been properly deleted.
     DCHECK(host_.get() == NULL);
   }
 
   // Change the session route for |client1_|.
   void ChangeSessionRoute(const std::string& channel_name,
                           const protocol::TransportRoute& route) {
     host_->OnSessionRouteChange(get_client(0), channel_name, route);
   }
 
-  // Creates a DesktopEnvironment with a fake webrtc::ScreenCapturer, to mock
+  // Creates a DesktopEnvironment with a fake webrtc::DesktopCapturer, to mock
   // DesktopEnvironmentFactory::Create().
   DesktopEnvironment* CreateDesktopEnvironment() {
     MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment();
     EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr())
         .Times(0);
     EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
         .Times(AtMost(1))
         .WillOnce(Invoke(this, &ChromotingHostTest::CreateInputInjector));
     EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
         .Times(AtMost(1));
@@ skipping 12 matching lines @@
   }
 
   // Creates a dummy InputInjector, to mock
   // DesktopEnvironment::CreateInputInjector().
   InputInjector* CreateInputInjector() {
     MockInputInjector* input_injector = new MockInputInjector();
     EXPECT_CALL(*input_injector, StartPtr(_));
     return input_injector;
   }
 
-  // Creates a fake webrtc::ScreenCapturer, to mock
+  // Creates a fake webrtc::DesktopCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
-  webrtc::ScreenCapturer* CreateVideoCapturer() {
-    return new FakeScreenCapturer();
+  webrtc::DesktopCapturer* CreateVideoCapturer() {
+    return new FakeDesktopCapturer();
   }
 
   // Creates a MockMouseCursorMonitor, to mock
   // DesktopEnvironment::CreateMouseCursorMonitor().
   webrtc::MouseCursorMonitor* CreateMouseCursorMonitor() {
     return new FakeMouseCursorMonitor();
   }
 
   void DisconnectAllClients() {
     host_->DisconnectAllClients();
@@ skipping 425 matching lines @@
   ExpectClientDisconnected(0, true, video_packet_sent,
       InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost));
   EXPECT_CALL(host_status_observer_, OnShutdown());
 
   host_->Start(xmpp_login_);
   SimulateClientConnection(0, true, false);
   message_loop_.Run();
 }
 
 }  // namespace remoting