summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_process_unittest.cc
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-08 09:58:09 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-08 16:59:03 +0000
commit11d989c52c6da43c5e8eb9d377ef0286a1cc8fba (patch)
treef2cb68b6b799bbfcdce2a51e72f69aa0164bb845 /remoting/host/desktop_process_unittest.cc
parentc9d7a691bb7a1c5cfeeddfc29f227215a9338045 (diff)
downloadchromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.zip
chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.gz
chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.bz2
replace OVERRIDE and FINAL with override and final in remoting/
BUG=417463 Review URL: https://codereview.chromium.org/628753002 Cr-Commit-Position: refs/heads/master@{#298734}
Diffstat (limited to 'remoting/host/desktop_process_unittest.cc')
-rw-r--r--remoting/host/desktop_process_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 69acc3a..39dc75b 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/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());
@@ -98,8 +98,8 @@ class DesktopProcessTest : public testing::Test {
virtual ~DesktopProcessTest();
// testing::Test overrides
- virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
+ virtual void SetUp() override;
+ virtual void TearDown() override;
// MockDaemonListener mocks
void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);