Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: components/sync_driver/device_info_data_type_controller_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/device_info_data_type_controller_unittest.cc
diff --git a/components/sync_driver/device_info_data_type_controller_unittest.cc b/components/sync_driver/device_info_data_type_controller_unittest.cc
index a025913e3d1a325a71c34810bdebfa8f6d310737..7161929204dd38947f424933c87a8b3c3208fb72 100644
--- a/components/sync_driver/device_info_data_type_controller_unittest.cc
+++ b/components/sync_driver/device_info_data_type_controller_unittest.cc
@@ -25,7 +25,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
last_type_(syncer::UNSPECIFIED) {}
virtual ~DeviceInfoDataTypeControllerTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
local_device_.reset(new LocalDeviceInfoProviderMock(
"cache_guid",
"Wayne Gretzky's Hacking Box",
@@ -45,7 +45,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
last_error_ = syncer::SyncError();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
controller_ = NULL;
local_device_.reset();
}
@@ -57,7 +57,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
}
virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
- syncer::ModelType type) OVERRIDE {
+ syncer::ModelType type) override {
// Shouldn't be called for this test.
NOTREACHED();
return base::WeakPtr<syncer::SyncableService>();
@@ -66,7 +66,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
const scoped_refptr<syncer::AttachmentStore>& attachment_store,
const syncer::UserShare& user_share,
- syncer::AttachmentService::Delegate* delegate) OVERRIDE {
+ syncer::AttachmentService::Delegate* delegate) override {
// Shouldn't be called for this test.
NOTREACHED();
return scoped_ptr<syncer::AttachmentService>();
« no previous file with comments | « components/sync_driver/device_info_data_type_controller.h ('k') | components/sync_driver/device_info_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698