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 7a188a8..47f76df 100644 (file)
--- a/src/remoting/host/desktop_process_unittest.cc
+++ b/src/remoting/host/desktop_process_unittest.cc
@@ -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,11 +95,11 @@ 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);
@@ -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();