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

Unified Diff: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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/chromeos/login/signin/oauth2_browsertest.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index c4133ae61c6014c8d1dc1bffd02d0cc3787c14e7..f4adee3bb9c07f4a2e8c7f929a946c65e98645aa 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -104,7 +104,7 @@ class OAuth2LoginManagerStateWaiter : public OAuth2LoginManager::Observer {
// OAuth2LoginManager::Observer overrides.
virtual void OnSessionRestoreStateChanged(
Profile* user_profile,
- OAuth2LoginManager::SessionRestoreState state) OVERRIDE {
+ OAuth2LoginManager::SessionRestoreState state) override {
if (!waiting_for_state_)
return;
@@ -218,7 +218,7 @@ class OAuth2Test : public OobeBaseTest {
protected:
// OobeBaseTest overrides.
- virtual Profile* profile() OVERRIDE {
+ virtual Profile* profile() override {
if (user_manager::UserManager::Get()->GetActiveUser())
return ProfileManager::GetPrimaryUserProfile();
@@ -578,7 +578,7 @@ class DelayedFakeGaia : public FakeGaia {
private:
// FakeGaia overrides.
virtual void HandleMergeSession(const HttpRequest& request,
- BasicHttpResponse* http_response) OVERRIDE {
+ BasicHttpResponse* http_response) override {
start_event_.Signal();
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
@@ -606,7 +606,7 @@ class MergeSessionTest : public OAuth2Test {
fake_gaia_.reset(delayed_fake_gaia_);
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
OAuth2Test::SetUpCommandLine(command_line);
// Get fake URL for fake google.com.
@@ -624,7 +624,7 @@ class MergeSessionTest : public OAuth2Test {
non_google_page_url_ = non_google_url.Resolve(kRandomPagePath);
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
embedded_test_server()->RegisterRequestHandler(
base::Bind(&FakeGoogle::HandleRequest,
base::Unretained(&fake_google_)));

Powered by Google App Engine
This is Rietveld 408576698