diff options
Diffstat (limited to 'cc/trees')
-rw-r--r-- | cc/trees/layer_tree_host_common_unittest.cc | 2 | ||||
-rw-r--r-- | cc/trees/layer_tree_host_unittest_no_message_loop.cc | 2 | ||||
-rw-r--r-- | cc/trees/layer_tree_host_unittest_proxy.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index 72eb287..01941c1 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc @@ -5672,7 +5672,7 @@ class LCDTextTest : public LayerTreeHostCommonTestBase, public testing::TestWithParam<LCDTextTestParam> { protected: - virtual void SetUp() { + void SetUp() override { can_use_lcd_text_ = std::tr1::get<0>(GetParam()); layers_always_allowed_lcd_text_ = std::tr1::get<1>(GetParam()); diff --git a/cc/trees/layer_tree_host_unittest_no_message_loop.cc b/cc/trees/layer_tree_host_unittest_no_message_loop.cc index 102e8ac..3e87b55 100644 --- a/cc/trees/layer_tree_host_unittest_no_message_loop.cc +++ b/cc/trees/layer_tree_host_unittest_no_message_loop.cc @@ -51,7 +51,7 @@ class LayerTreeHostNoMessageLoopTest did_commit_and_draw_frame_(false), size_(100, 100), no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} - virtual ~LayerTreeHostNoMessageLoopTest() {} + ~LayerTreeHostNoMessageLoopTest() override {} // LayerTreeHostClient overrides. void WillBeginMainFrame(int frame_id) override {} diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc index f27b553..3135103 100644 --- a/cc/trees/layer_tree_host_unittest_proxy.cc +++ b/cc/trees/layer_tree_host_unittest_proxy.cc @@ -28,7 +28,7 @@ namespace cc { class ProxyTest : public LayerTreeTest { protected: ProxyTest() {} - virtual ~ProxyTest() {} + ~ProxyTest() override {} void Run(bool threaded, bool impl_side_painting) { // We don't need to care about delegating mode. @@ -67,7 +67,7 @@ class ProxyTestScheduledActionsBasic : public ProxyTest { ProxyTestScheduledActionsBasic() : action_phase_(0) { } - virtual ~ProxyTestScheduledActionsBasic() {} + ~ProxyTestScheduledActionsBasic() override {} private: int action_phase_; @@ -80,7 +80,7 @@ PROXY_TEST_SCHEDULED_ACTION(ProxyTestScheduledActionsBasic); class ThreadProxyTest : public ProxyTest { protected: ThreadProxyTest() {} - virtual ~ThreadProxyTest() {} + ~ThreadProxyTest() override {} const ThreadProxy::MainThreadOnly& ThreadProxyMainOnly() const { DCHECK(proxy()); @@ -101,7 +101,7 @@ class ThreadProxyTest : public ProxyTest { class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { protected: ThreadProxyTestSetNeedsCommit() {} - virtual ~ThreadProxyTestSetNeedsCommit() {} + ~ThreadProxyTestSetNeedsCommit() override {} void BeginTest() override { EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); |