diff options
| author | mostynb <mostynb@opera.com> | 2014-10-08 09:58:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-08 16:59:03 +0000 |
| commit | 11d989c52c6da43c5e8eb9d377ef0286a1cc8fba (patch) | |
| tree | f2cb68b6b799bbfcdce2a51e72f69aa0164bb845 /remoting/host/daemon_process_unittest.cc | |
| parent | c9d7a691bb7a1c5cfeeddfc29f227215a9338045 (diff) | |
| download | chromium_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/daemon_process_unittest.cc')
| -rw-r--r-- | remoting/host/daemon_process_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc index 7043f78..22877c6 100644 --- a/remoting/host/daemon_process_unittest.cc +++ b/remoting/host/daemon_process_unittest.cc @@ -43,7 +43,7 @@ class FakeDesktopSession : public DesktopSession { virtual ~FakeDesktopSession(); virtual void SetScreenResolution( - const ScreenResolution& resolution) OVERRIDE {} + const ScreenResolution& resolution) override {} private: DISALLOW_COPY_AND_ASSIGN(FakeDesktopSession); @@ -60,10 +60,10 @@ class MockDaemonProcess : public DaemonProcess { virtual scoped_ptr<DesktopSession> DoCreateDesktopSession( int terminal_id, const ScreenResolution& resolution, - bool virtual_terminal) OVERRIDE; + bool virtual_terminal) override; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void SendToNetwork(IPC::Message* message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void SendToNetwork(IPC::Message* message) override; MOCK_METHOD1(Received, void(const IPC::Message&)); MOCK_METHOD1(Sent, void(const IPC::Message&)); @@ -124,8 +124,8 @@ class DaemonProcessTest : public testing::Test { DaemonProcessTest(); virtual ~DaemonProcessTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // DaemonProcess mocks DesktopSession* DoCreateDesktopSession(int terminal_id); |