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

Unified Diff: chrome/browser/sync/startup_controller_unittest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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: chrome/browser/sync/startup_controller_unittest.cc
diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc
index b0fb4743277e8c99ed7ea0b3b550120f4e396428..df775bbec8881a748f0873441072df4d9725cda1 100644
--- a/chrome/browser/sync/startup_controller_unittest.cc
+++ b/chrome/browser/sync/startup_controller_unittest.cc
@@ -36,11 +36,11 @@ class FakeSupervisedUserSigninManagerWrapper
public:
FakeSupervisedUserSigninManagerWrapper()
: SupervisedUserSigninManagerWrapper(NULL, NULL) {}
- virtual std::string GetEffectiveUsername() const OVERRIDE {
+ virtual std::string GetEffectiveUsername() const override {
return account_;
}
- virtual std::string GetAccountIdToUse() const OVERRIDE {
+ virtual std::string GetAccountIdToUse() const override {
return account_;
}
@@ -54,7 +54,7 @@ class StartupControllerTest : public testing::Test {
public:
StartupControllerTest() : started_(false) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
profile_.reset(new TestingProfile());
sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
token_service_.reset(static_cast<FakeProfileOAuth2TokenService*>(
@@ -73,7 +73,7 @@ class StartupControllerTest : public testing::Test {
base::TimeDelta::FromSeconds(0));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
controller_.reset();
signin_.reset();
token_service_->Shutdown();
« no previous file with comments | « chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc ('k') | chrome/browser/sync/sync_error_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698