Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / desktop_process_unittest.cc

diff --git a/src/remoting/host/desktop_process_unittest.cc b/src/remoting/host/desktop_process_unittest.cc
index 19e5b56..47f76df 100644 (file)
--- a/src/remoting/host/desktop_process_unittest.cc
+++ b/src/remoting/host/desktop_process_unittest.cc
@@ -19,9 +19,9 @@
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_process.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_capturer_fake.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -43,7 +43,7 @@ class MockDaemonListener : public IPC::Listener {
   MockDaemonListener() {}
   virtual ~MockDaemonListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit));
   MOCK_METHOD1(OnChannelConnected, void(int32));
@@ -58,7 +58,7 @@ class MockNetworkListener : public IPC::Listener {
   MockNetworkListener() {}
   virtual ~MockNetworkListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   MOCK_METHOD1(OnChannelConnected, void(int32));
   MOCK_METHOD0(OnChannelError, void());
@@ -95,17 +95,17 @@ bool MockNetworkListener::OnMessageReceived(const IPC::Message& message) {
 class DesktopProcessTest : public testing::Test {
  public:
   DesktopProcessTest();
-  virtual ~DesktopProcessTest();
+  ~DesktopProcessTest() override;
 
   // testing::Test overrides
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  void SetUp() override;
+  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();
 
@@ -113,9 +113,9 @@ class DesktopProcessTest : public testing::Test {
   // 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.
@@ -218,8 +218,8 @@ InputInjector* DesktopProcessTest::CreateInputInjector() {
   return input_injector;
 }
 
-webrtc::ScreenCapturer* DesktopProcessTest::CreateVideoCapturer() {
-  return new ScreenCapturerFake();
+webrtc::DesktopCapturer* DesktopProcessTest::CreateVideoCapturer() {
+  return new FakeDesktopCapturer();
 }
 
 void DesktopProcessTest::DisconnectChannels() {
@@ -262,8 +262,7 @@ void DesktopProcessTest::RunDesktopProcess() {
       .WillRepeatedly(Return(false));
 
   DesktopProcess desktop_process(ui_task_runner, io_task_runner_, channel_name);
-  EXPECT_TRUE(desktop_process.Start(
-      desktop_environment_factory.PassAs<DesktopEnvironmentFactory>()));
+  EXPECT_TRUE(desktop_process.Start(desktop_environment_factory.Pass()));
 
   ui_task_runner = NULL;
   run_loop.Run();