Index: chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc |
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc |
index f7d73821659da79ca35c51af3bf7d37f2b5724f2..95908d8331e59c6bc17c6e3469de6ad24a4c138d 100644 |
--- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc |
+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc |
@@ -52,7 +52,7 @@ class FakeProfileSyncService : public ProfileSyncService { |
sync_initialized_(true), |
initialized_state_violation_(false) {} |
- virtual ~FakeProfileSyncService() {} |
+ ~FakeProfileSyncService() override {} |
static KeyedService* BuildFakeProfileSyncService( |
content::BrowserContext* context) { |
@@ -66,12 +66,9 @@ class FakeProfileSyncService : public ProfileSyncService { |
bool initialized_state_violation() { return initialized_state_violation_; } |
// ProfileSyncService: |
- virtual bool SyncActive() const override { |
- return sync_initialized_; |
- } |
+ bool SyncActive() const override { return sync_initialized_; } |
- virtual void AddObserver( |
- ProfileSyncServiceBase::Observer* observer) override { |
+ void AddObserver(ProfileSyncServiceBase::Observer* observer) override { |
if (sync_initialized_) |
initialized_state_violation_ = true; |
// Set sync initialized state to true so the function will run after |
@@ -83,7 +80,7 @@ class FakeProfileSyncService : public ProfileSyncService { |
base::Unretained(observer))); |
} |
- virtual syncer::ModelTypeSet GetEncryptedDataTypes() const override { |
+ syncer::ModelTypeSet GetEncryptedDataTypes() const override { |
if (!sync_initialized_) |
initialized_state_violation_ = true; |
syncer::ModelTypeSet type_set; |
@@ -91,7 +88,7 @@ class FakeProfileSyncService : public ProfileSyncService { |
return type_set; |
} |
- virtual syncer::ModelTypeSet GetPreferredDataTypes() const override { |
+ syncer::ModelTypeSet GetPreferredDataTypes() const override { |
if (!sync_initialized_) |
initialized_state_violation_ = true; |
syncer::ModelTypeSet preferred_types = |
@@ -114,14 +111,14 @@ class PreferencesPrivateApiTest : public ExtensionApiTest { |
PreferencesPrivateApiTest() : browser_(NULL), service_(NULL) {} |
virtual ~PreferencesPrivateApiTest() {} |
- virtual void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(CommandLine* command_line) override { |
#if defined(OS_CHROMEOS) |
command_line->AppendSwitch( |
chromeos::switches::kIgnoreUserProfileMappingForTests); |
#endif |
} |
- virtual void SetUpOnMainThread() override { |
+ void SetUpOnMainThread() override { |
ExtensionApiTest::SetUpOnMainThread(); |
base::FilePath path; |