Index: chrome/browser/extensions/api/identity/identity_apitest.cc |
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc |
index 47ff74c4afd1bd45ca2e93f9f40ffbd9d93dad36..f8de0ad4f34f24ae7a856057a155a83b71528238 100644 |
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc |
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc |
@@ -87,7 +87,7 @@ class SendResponseDelegate |
virtual void OnSendResponse(UIThreadExtensionFunction* function, |
bool success, |
- bool bad_message) OVERRIDE { |
+ bool bad_message) override { |
ASSERT_FALSE(bad_message); |
ASSERT_FALSE(HasResponse()); |
response_.reset(new bool); |
@@ -164,7 +164,7 @@ class TestHangOAuth2MintTokenFlow : public OAuth2MintTokenFlow { |
TestHangOAuth2MintTokenFlow() |
: OAuth2MintTokenFlow(NULL, NULL, OAuth2MintTokenFlow::Parameters()) {} |
- virtual void Start() OVERRIDE { |
+ virtual void Start() override { |
// Do nothing, simulating a hanging network call. |
} |
}; |
@@ -186,7 +186,7 @@ class TestOAuth2MintTokenFlow : public OAuth2MintTokenFlow { |
delegate_(delegate) { |
} |
- virtual void Start() OVERRIDE { |
+ virtual void Start() override { |
switch (result_) { |
case ISSUE_ADVICE_SUCCESS: { |
IssueAdviceInfo info; |
@@ -236,7 +236,7 @@ class WaitForGURLAndCloseWindow : public content::WindowedNotificationObserver { |
// NotificationObserver: |
virtual void Observe(int type, |
const content::NotificationSource& source, |
- const content::NotificationDetails& details) OVERRIDE { |
+ const content::NotificationDetails& details) override { |
content::NavigationController* web_auth_flow_controller = |
content::Source<content::NavigationController>(source).ptr(); |
content::WebContents* web_contents = |
@@ -316,7 +316,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { |
std::string login_access_token() const { return login_access_token_; } |
- virtual void StartLoginAccessTokenRequest() OVERRIDE { |
+ virtual void StartLoginAccessTokenRequest() override { |
if (auto_login_access_token_) { |
if (login_access_token_result_) { |
OnGetTokenSuccess(login_token_request_.get(), |
@@ -334,7 +334,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { |
} |
} |
- virtual void ShowLoginPopup() OVERRIDE { |
+ virtual void ShowLoginPopup() override { |
EXPECT_FALSE(login_ui_shown_); |
login_ui_shown_ = true; |
if (login_ui_result_) |
@@ -344,7 +344,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { |
} |
virtual void ShowOAuthApprovalDialog( |
- const IssueAdviceInfo& issue_advice) OVERRIDE { |
+ const IssueAdviceInfo& issue_advice) override { |
scope_ui_shown_ = true; |
if (scope_ui_result_) { |
@@ -359,7 +359,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { |
} |
virtual OAuth2MintTokenFlow* CreateMintTokenFlow( |
- const std::string& login_access_token) OVERRIDE { |
+ const std::string& login_access_token) override { |
EXPECT_TRUE(login_access_token_.empty()); |
// Save the login token used to create the flow so tests can see |
// what account was used. |
@@ -397,7 +397,7 @@ gaia::AccountIds CreateIds(std::string email, std::string obfid) { |
} |
class IdentityGetAccountsFunctionTest : public ExtensionBrowserTest { |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
ExtensionBrowserTest::SetUpCommandLine(command_line); |
command_line->AppendSwitch(switches::kExtensionsMultiAccount); |
} |
@@ -509,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(IdentityGetAccountsFunctionTest, TwoAccountsSignedIn) { |
class IdentityOldProfilesGetAccountsFunctionTest |
: public IdentityGetAccountsFunctionTest { |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
// Don't add the multi-account switch that parent class would have. |
} |
}; |
@@ -598,12 +598,12 @@ IN_PROC_BROWSER_TEST_F(IdentityGetProfileUserInfoFunctionTest, |
class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest { |
public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
AsyncExtensionBrowserTest::SetUpCommandLine(command_line); |
command_line->AppendSwitch(switches::kExtensionsMultiAccount); |
} |
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
+ virtual void SetUpInProcessBrowserTestFixture() override { |
AsyncExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); |
will_create_browser_context_services_subscription_ = |
@@ -627,7 +627,7 @@ class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest { |
context, &FakeAccountReconcilor::Build); |
} |
- virtual void SetUpOnMainThread() OVERRIDE { |
+ virtual void SetUpOnMainThread() override { |
AsyncExtensionBrowserTest::SetUpOnMainThread(); |
// Grab references to the fake signin manager and token service. |
@@ -1657,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(RemoveCachedAuthTokenFunctionTest, MatchingToken) { |
class LaunchWebAuthFlowFunctionTest : public AsyncExtensionBrowserTest { |
public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
AsyncExtensionBrowserTest::SetUpCommandLine(command_line); |
// Reduce performance test variance by disabling background networking. |
command_line->AppendSwitch(switches::kDisableBackgroundNetworking); |