| Index: remoting/host/desktop_process_unittest.cc
|
| diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
|
| index 6a7623c23816b2b156f83992fd945f2c524af64e..22580aa411edb407f90108e22773a08de038565b 100644
|
| --- a/remoting/host/desktop_process_unittest.cc
|
| +++ b/remoting/host/desktop_process_unittest.cc
|
| @@ -15,7 +15,6 @@
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_message.h"
|
| -#include "media/video/capture/screen/screen_capturer_fake.h"
|
| #include "remoting/base/auto_thread.h"
|
| #include "remoting/base/auto_thread_task_runner.h"
|
| #include "remoting/host/chromoting_messages.h"
|
| @@ -24,9 +23,10 @@
|
| #include "remoting/host/host_mock_objects.h"
|
| #include "remoting/host/screen_resolution.h"
|
| #include "remoting/protocol/protocol_mock_objects.h"
|
| -#include "testing/gmock_mutant.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| +#include "testing/gmock_mutant.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "third_party/webrtc/modules/desktop_capture/screen_capturer_fake.h"
|
|
|
| using testing::_;
|
| using testing::AnyNumber;
|
| @@ -105,7 +105,7 @@ class DesktopProcessTest : public testing::Test {
|
| void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);
|
| void OnDesktopAttached(IPC::PlatformFileForTransit desktop_process);
|
|
|
| - // Creates a DesktopEnvironment with a fake media::ScreenCapturer, to mock
|
| + // Creates a DesktopEnvironment with a fake webrtc::ScreenCapturer, to mock
|
| // DesktopEnvironmentFactory::Create().
|
| DesktopEnvironment* CreateDesktopEnvironment();
|
|
|
| @@ -113,9 +113,9 @@ class DesktopProcessTest : public testing::Test {
|
| // DesktopEnvironment::CreateInputInjector().
|
| InputInjector* CreateInputInjector();
|
|
|
| - // Creates a fake media::ScreenCapturer, to mock
|
| + // Creates a fake webrtc::ScreenCapturer, to mock
|
| // DesktopEnvironment::CreateVideoCapturer().
|
| - media::ScreenCapturer* CreateVideoCapturer();
|
| + webrtc::ScreenCapturer* CreateVideoCapturer();
|
|
|
| // Disconnects the daemon-to-desktop channel causing the desktop process to
|
| // exit.
|
| @@ -219,8 +219,8 @@ InputInjector* DesktopProcessTest::CreateInputInjector() {
|
| return input_injector;
|
| }
|
|
|
| -media::ScreenCapturer* DesktopProcessTest::CreateVideoCapturer() {
|
| - return new media::ScreenCapturerFake();
|
| +webrtc::ScreenCapturer* DesktopProcessTest::CreateVideoCapturer() {
|
| + return new webrtc::ScreenCapturerFake();
|
| }
|
|
|
| void DesktopProcessTest::DisconnectChannels() {
|
|
|