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

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_proxy.h"
-#include "media/video/capture/screen/screen_capturer_fake.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/host_mock_objects.h"
+#include "remoting/host/screen_capturer_fake.h"
 #include "remoting/jingle_glue/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 "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::remoting::protocol::MockClientStub;
@@ skipping 198 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 media::ScreenCapturer, to mock
+  // Creates a DesktopEnvironment with a fake webrtc::ScreenCapturer, 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));
     EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr())
         .Times(AtMost(1))
         .WillOnce(Invoke(this, &ChromotingHostTest::CreateVideoCapturer));
     EXPECT_CALL(*desktop_environment, GetCapabilities())
         .Times(AtMost(1));
     EXPECT_CALL(*desktop_environment, SetCapabilities(_))
         .Times(AtMost(1));
 
     return desktop_environment;
   }
 
   // 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 media::ScreenCapturer, to mock
+  // Creates a fake webrtc::ScreenCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
-  media::ScreenCapturer* CreateVideoCapturer() {
-    return new media::ScreenCapturerFake();
+  webrtc::ScreenCapturer* CreateVideoCapturer() {
+    return new ScreenCapturerFake();
   }
 
   void DisconnectAllClients() {
     host_->DisconnectAllClients();
   }
 
   // Helper method to disconnect client 1 from the host.
   void DisconnectClient1() {
     NotifyClientSessionClosed(0);
   }
@@ skipping 368 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