Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: remoting/host/desktop_process_unittest.cc

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/host/desktop_process.h ('k') | remoting/host/desktop_resizer_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/desktop_process.h" 5 #include "remoting/host/desktop_process.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 25 matching lines...) Expand all
36 36
37 namespace remoting { 37 namespace remoting {
38 38
39 namespace { 39 namespace {
40 40
41 class MockDaemonListener : public IPC::Listener { 41 class MockDaemonListener : public IPC::Listener {
42 public: 42 public:
43 MockDaemonListener() {} 43 MockDaemonListener() {}
44 virtual ~MockDaemonListener() {} 44 virtual ~MockDaemonListener() {}
45 45
46 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 46 virtual bool OnMessageReceived(const IPC::Message& message) override;
47 47
48 MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit)); 48 MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit));
49 MOCK_METHOD1(OnChannelConnected, void(int32)); 49 MOCK_METHOD1(OnChannelConnected, void(int32));
50 MOCK_METHOD0(OnChannelError, void()); 50 MOCK_METHOD0(OnChannelError, void());
51 51
52 private: 52 private:
53 DISALLOW_COPY_AND_ASSIGN(MockDaemonListener); 53 DISALLOW_COPY_AND_ASSIGN(MockDaemonListener);
54 }; 54 };
55 55
56 class MockNetworkListener : public IPC::Listener { 56 class MockNetworkListener : public IPC::Listener {
57 public: 57 public:
58 MockNetworkListener() {} 58 MockNetworkListener() {}
59 virtual ~MockNetworkListener() {} 59 virtual ~MockNetworkListener() {}
60 60
61 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 61 virtual bool OnMessageReceived(const IPC::Message& message) override;
62 62
63 MOCK_METHOD1(OnChannelConnected, void(int32)); 63 MOCK_METHOD1(OnChannelConnected, void(int32));
64 MOCK_METHOD0(OnChannelError, void()); 64 MOCK_METHOD0(OnChannelError, void());
65 65
66 MOCK_METHOD0(OnDesktopEnvironmentCreated, void()); 66 MOCK_METHOD0(OnDesktopEnvironmentCreated, void());
67 67
68 private: 68 private:
69 DISALLOW_COPY_AND_ASSIGN(MockNetworkListener); 69 DISALLOW_COPY_AND_ASSIGN(MockNetworkListener);
70 }; 70 };
71 71
(...skipping 19 matching lines...) Expand all
91 } 91 }
92 92
93 } // namespace 93 } // namespace
94 94
95 class DesktopProcessTest : public testing::Test { 95 class DesktopProcessTest : public testing::Test {
96 public: 96 public:
97 DesktopProcessTest(); 97 DesktopProcessTest();
98 virtual ~DesktopProcessTest(); 98 virtual ~DesktopProcessTest();
99 99
100 // testing::Test overrides 100 // testing::Test overrides
101 virtual void SetUp() OVERRIDE; 101 virtual void SetUp() override;
102 virtual void TearDown() OVERRIDE; 102 virtual void TearDown() override;
103 103
104 // MockDaemonListener mocks 104 // MockDaemonListener mocks
105 void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process); 105 void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);
106 void OnDesktopAttached(IPC::PlatformFileForTransit desktop_process); 106 void OnDesktopAttached(IPC::PlatformFileForTransit desktop_process);
107 107
108 // Creates a DesktopEnvironment with a fake webrtc::DesktopCapturer, to mock 108 // Creates a DesktopEnvironment with a fake webrtc::DesktopCapturer, to mock
109 // DesktopEnvironmentFactory::Create(). 109 // DesktopEnvironmentFactory::Create().
110 DesktopEnvironment* CreateDesktopEnvironment(); 110 DesktopEnvironment* CreateDesktopEnvironment();
111 111
112 // Creates a dummy InputInjector, to mock 112 // Creates a dummy InputInjector, to mock
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 } 336 }
337 337
338 // Run the desktop process and ask it to crash. 338 // Run the desktop process and ask it to crash.
339 TEST_F(DesktopProcessTest, DeathTest) { 339 TEST_F(DesktopProcessTest, DeathTest) {
340 testing::GTEST_FLAG(death_test_style) = "threadsafe"; 340 testing::GTEST_FLAG(death_test_style) = "threadsafe";
341 341
342 EXPECT_DEATH(RunDeathTest(), ""); 342 EXPECT_DEATH(RunDeathTest(), "");
343 } 343 }
344 344
345 } // namespace remoting 345 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/desktop_process.h ('k') | remoting/host/desktop_resizer_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698