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

Unified Diff: chrome/browser/extensions/api/identity/identity_apitest.cc

Issue 666153002: Standardize usage of virtual/override/final in chrome/browser/extensions/ (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: 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 c73cc0cd9fb4d1d9dd0af386cc1a96a975d8ccce..86d34e2c7fd648f3b0af07e3f81d8dd3cb69c349 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -85,9 +85,9 @@ class SendResponseDelegate
return *response_.get();
}
- virtual void OnSendResponse(UIThreadExtensionFunction* function,
- bool success,
- bool bad_message) override {
+ void OnSendResponse(UIThreadExtensionFunction* function,
+ bool success,
+ bool bad_message) override {
ASSERT_FALSE(bad_message);
ASSERT_FALSE(HasResponse());
response_.reset(new bool);
@@ -164,8 +164,8 @@ class TestHangOAuth2MintTokenFlow : public OAuth2MintTokenFlow {
TestHangOAuth2MintTokenFlow()
: OAuth2MintTokenFlow(NULL, OAuth2MintTokenFlow::Parameters()) {}
- virtual void Start(net::URLRequestContextGetter* context,
- const std::string& access_token) override {
+ void Start(net::URLRequestContextGetter* context,
+ const std::string& access_token) override {
// Do nothing, simulating a hanging network call.
}
};
@@ -186,8 +186,8 @@ class TestOAuth2MintTokenFlow : public OAuth2MintTokenFlow {
result_(result),
delegate_(delegate) {}
- virtual void Start(net::URLRequestContextGetter* context,
- const std::string& access_token) override {
+ void Start(net::URLRequestContextGetter* context,
+ const std::string& access_token) override {
switch (result_) {
case ISSUE_ADVICE_SUCCESS: {
IssueAdviceInfo info;
@@ -235,9 +235,9 @@ class WaitForGURLAndCloseWindow : public content::WindowedNotificationObserver {
url_(url) {}
// NotificationObserver:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override {
+ void Observe(int type,
+ const content::NotificationSource& source,
+ 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 {
+ 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 {
+ void ShowLoginPopup() override {
EXPECT_FALSE(login_ui_shown_);
login_ui_shown_ = true;
if (login_ui_result_)
@@ -343,8 +343,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction {
SigninFailed();
}
- virtual void ShowOAuthApprovalDialog(
- const IssueAdviceInfo& issue_advice) override {
+ void ShowOAuthApprovalDialog(const IssueAdviceInfo& issue_advice) override {
scope_ui_shown_ = true;
if (scope_ui_result_) {
@@ -358,8 +357,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction {
}
}
- virtual void StartGaiaRequest(
- const std::string& login_access_token) override {
+ void StartGaiaRequest(const std::string& login_access_token) override {
EXPECT_TRUE(login_access_token_.empty());
// Save the login token used in the mint token flow so tests can see
// what account was used.
@@ -367,12 +365,12 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction {
IdentityGetAuthTokenFunction::StartGaiaRequest(login_access_token);
}
- virtual OAuth2MintTokenFlow* CreateMintTokenFlow() override {
+ OAuth2MintTokenFlow* CreateMintTokenFlow() override {
return flow_.release();
}
private:
- virtual ~FakeGetAuthTokenFunction() {}
+ ~FakeGetAuthTokenFunction() override {}
bool login_access_token_result_;
bool auto_login_access_token_;
bool login_ui_result_;
@@ -401,7 +399,7 @@ gaia::AccountIds CreateIds(std::string email, std::string obfid) {
}
class IdentityGetAccountsFunctionTest : public ExtensionBrowserTest {
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kExtensionsMultiAccount);
}
@@ -513,7 +511,7 @@ IN_PROC_BROWSER_TEST_F(IdentityGetAccountsFunctionTest, TwoAccountsSignedIn) {
class IdentityOldProfilesGetAccountsFunctionTest
: public IdentityGetAccountsFunctionTest {
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
// Don't add the multi-account switch that parent class would have.
}
};
@@ -602,12 +600,12 @@ IN_PROC_BROWSER_TEST_F(IdentityGetProfileUserInfoFunctionTest,
class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest {
public:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
AsyncExtensionBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kExtensionsMultiAccount);
}
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
AsyncExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
will_create_browser_context_services_subscription_ =
@@ -631,7 +629,7 @@ class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest {
context, &FakeAccountReconcilor::Build);
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
AsyncExtensionBrowserTest::SetUpOnMainThread();
// Grab references to the fake signin manager and token service.
@@ -1659,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(RemoveCachedAuthTokenFunctionTest, MatchingToken) {
class LaunchWebAuthFlowFunctionTest : public AsyncExtensionBrowserTest {
public:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
AsyncExtensionBrowserTest::SetUpCommandLine(command_line);
// Reduce performance test variance by disabling background networking.
command_line->AppendSwitch(switches::kDisableBackgroundNetworking);
« no previous file with comments | « chrome/browser/extensions/api/identity/identity_api.h ('k') | chrome/browser/extensions/api/identity/identity_signin_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698