From 79ff566325268a34a0ce078dbda3ea68d21850de Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 28 Apr 2015 10:22:22 -0700 Subject: Update {virtual,override} to follow C++11 style in components. The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1056633004 Cr-Commit-Position: refs/heads/master@{#327312} --- components/sync_driver/shared_change_processor_unittest.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/sync_driver') diff --git a/components/sync_driver/shared_change_processor_unittest.cc b/components/sync_driver/shared_change_processor_unittest.cc index d65fb54..a67c298 100644 --- a/components/sync_driver/shared_change_processor_unittest.cc +++ b/components/sync_driver/shared_change_processor_unittest.cc @@ -41,16 +41,16 @@ class SyncSharedChangeProcessorTest : did_connect_(false), has_attachment_service_(false) {} - virtual ~SyncSharedChangeProcessorTest() { + ~SyncSharedChangeProcessorTest() override { EXPECT_FALSE(db_syncable_service_.get()); } - virtual base::WeakPtr GetSyncableServiceForType( + base::WeakPtr GetSyncableServiceForType( syncer::ModelType type) override { return db_syncable_service_->AsWeakPtr(); } - virtual scoped_ptr CreateAttachmentService( + scoped_ptr CreateAttachmentService( scoped_ptr attachment_store, const syncer::UserShare& user_share, const std::string& store_birthday, @@ -60,7 +60,7 @@ class SyncSharedChangeProcessorTest : } protected: - virtual void SetUp() override { + void SetUp() override { test_user_share_.SetUp(); shared_change_processor_ = new SharedChangeProcessor(); ASSERT_TRUE(backend_thread_.Start()); @@ -70,7 +70,7 @@ class SyncSharedChangeProcessorTest : base::Unretained(this)))); } - virtual void TearDown() override { + void TearDown() override { EXPECT_TRUE(backend_thread_.message_loop_proxy()->PostTask( FROM_HERE, base::Bind(&SyncSharedChangeProcessorTest::TearDownDBSyncableService, -- cgit v1.1