diff options
author | danakj <danakj@chromium.org> | 2014-11-13 17:35:36 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-14 01:35:56 +0000 |
commit | aeb95060cbafd24bee436a32c83831b7b781f2e0 (patch) | |
tree | f32cfe100b5fa086d82be348e06743e00b7eaf16 /cc/scheduler | |
parent | a1d740044eebd0d5a01bb65ba12abdc468090333 (diff) | |
download | chromium_src-aeb95060cbafd24bee436a32c83831b7b781f2e0.zip chromium_src-aeb95060cbafd24bee436a32c83831b7b781f2e0.tar.gz chromium_src-aeb95060cbafd24bee436a32c83831b7b781f2e0.tar.bz2 |
cc: Remove readability/inheritance exception for linter in cc.
And make cc/ all linter clean.
R=enne
BUG=422353
Review URL: https://codereview.chromium.org/720323002
Cr-Commit-Position: refs/heads/master@{#304136}
Diffstat (limited to 'cc/scheduler')
-rw-r--r-- | cc/scheduler/begin_frame_source_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc index b741e35..a4b3d6e 100644 --- a/cc/scheduler/begin_frame_source_unittest.cc +++ b/cc/scheduler/begin_frame_source_unittest.cc @@ -312,7 +312,7 @@ class BackToBackBeginFrameSourceTest : public ::testing::Test { scoped_ptr<TestBackToBackBeginFrameSource> source_; scoped_ptr<MockBeginFrameObserver> obs_; - virtual void SetUp() override { + void SetUp() override { now_src_ = TestNowSource::Create(1000); task_runner_ = make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_, false)); @@ -323,7 +323,7 @@ class BackToBackBeginFrameSourceTest : public ::testing::Test { source_->AddObserver(obs_.get()); } - virtual void TearDown() override { obs_.reset(); } + void TearDown() override { obs_.reset(); } }; const int64_t BackToBackBeginFrameSourceTest::kDeadline = @@ -478,7 +478,7 @@ class SyntheticBeginFrameSourceTest : public ::testing::Test { scoped_ptr<TestSyntheticBeginFrameSource> source_; scoped_ptr<MockBeginFrameObserver> obs_; - virtual void SetUp() override { + void SetUp() override { now_src_ = TestNowSource::Create(1000); task_runner_ = make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_, false)); @@ -488,7 +488,7 @@ class SyntheticBeginFrameSourceTest : public ::testing::Test { source_->AddObserver(obs_.get()); } - virtual void TearDown() override { obs_.reset(); } + void TearDown() override { obs_.reset(); } }; TEST_F(SyntheticBeginFrameSourceTest, @@ -547,7 +547,7 @@ TEST_F(SyntheticBeginFrameSourceTest, VSyncChanges) { // BeginFrameSourceMultiplexer testing ----------------------------------- class BeginFrameSourceMultiplexerTest : public ::testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { mux_ = BeginFrameSourceMultiplexer::Create(); source1_store_ = make_scoped_ptr(new FakeBeginFrameSource()); @@ -559,7 +559,7 @@ class BeginFrameSourceMultiplexerTest : public ::testing::Test { source3_ = source3_store_.get(); } - virtual void TearDown() override { + void TearDown() override { // Make sure the mux is torn down before the sources. mux_.reset(); } |