Index: cc/trees/layer_tree_host_unittest_proxy.cc |
diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc |
index 4f79311f64995d79e2513d49959312d71cd28031..5993479105266782d188a095ca6ac0096c49ab81 100644 |
--- a/cc/trees/layer_tree_host_unittest_proxy.cc |
+++ b/cc/trees/layer_tree_host_unittest_proxy.cc |
@@ -37,8 +37,8 @@ class ProxyTest : public LayerTreeTest { |
RunTest(threaded, delegating_renderer, impl_side_painting); |
} |
- virtual void BeginTest() OVERRIDE {} |
- virtual void AfterTest() OVERRIDE {} |
+ virtual void BeginTest() override {} |
+ virtual void AfterTest() override {} |
private: |
DISALLOW_COPY_AND_ASSIGN(ProxyTest); |
@@ -46,28 +46,28 @@ class ProxyTest : public LayerTreeTest { |
class ProxyTestScheduledActionsBasic : public ProxyTest { |
protected: |
- virtual void BeginTest() OVERRIDE { |
+ virtual void BeginTest() override { |
proxy()->SetNeedsCommit(); |
} |
- virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE { |
+ virtual void ScheduledActionBeginOutputSurfaceCreation() override { |
EXPECT_EQ(0, action_phase_++); |
} |
- virtual void ScheduledActionSendBeginMainFrame() OVERRIDE { |
+ virtual void ScheduledActionSendBeginMainFrame() override { |
EXPECT_EQ(1, action_phase_++); |
} |
- virtual void ScheduledActionCommit() OVERRIDE { |
+ virtual void ScheduledActionCommit() override { |
EXPECT_EQ(2, action_phase_++); |
} |
- virtual void ScheduledActionDrawAndSwapIfPossible() OVERRIDE { |
+ virtual void ScheduledActionDrawAndSwapIfPossible() override { |
EXPECT_EQ(3, action_phase_++); |
EndTest(); |
} |
- virtual void AfterTest() OVERRIDE { |
+ virtual void AfterTest() override { |
EXPECT_EQ(4, action_phase_); |
} |
@@ -109,7 +109,7 @@ class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { |
ThreadProxyTestSetNeedsCommit() {} |
virtual ~ThreadProxyTestSetNeedsCommit() {} |
- virtual void BeginTest() OVERRIDE { |
+ virtual void BeginTest() override { |
EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); |
EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); |
@@ -119,7 +119,7 @@ class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { |
EXPECT_TRUE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); |
} |
- virtual void DidBeginMainFrame() OVERRIDE { |
+ virtual void DidBeginMainFrame() override { |
EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); |
EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); |