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

Unified Diff: google_apis/gaia/oauth2_token_service_unittest.cc

Issue 625293003: replace OVERRIDE and FINAL with override and final in google_apis/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another 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
« no previous file with comments | « google_apis/gaia/oauth2_token_service_test_util.h ('k') | google_apis/gaia/ubertoken_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gaia/oauth2_token_service_unittest.cc
diff --git a/google_apis/gaia/oauth2_token_service_unittest.cc b/google_apis/gaia/oauth2_token_service_unittest.cc
index b79e361c44c7f6c9cec6f0cac4553dab4924d125..71c8d328ae9c51a13d3ed1528fa9c5341ca4c7ee 100644
--- a/google_apis/gaia/oauth2_token_service_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_unittest.cc
@@ -30,7 +30,7 @@ class RetryingTestingOAuth2TokenServiceConsumer
virtual ~RetryingTestingOAuth2TokenServiceConsumer() {}
virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
- const GoogleServiceAuthError& error) OVERRIDE {
+ const GoogleServiceAuthError& error) override {
TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(request, error);
request_.reset(oauth2_service_->StartRequest(
account_id_, OAuth2TokenService::ScopeSet(), this).release());
@@ -63,7 +63,7 @@ class TestOAuth2TokenService : public OAuth2TokenService {
}
virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
- OVERRIDE {
+ override {
std::map<std::string, std::string>::const_iterator it =
refresh_tokens_.find(account_id);
@@ -72,14 +72,14 @@ class TestOAuth2TokenService : public OAuth2TokenService {
private:
// OAuth2TokenService implementation.
- virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE {
+ virtual net::URLRequestContextGetter* GetRequestContext() override {
return request_context_getter_.get();
}
virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
const std::string& account_id,
net::URLRequestContextGetter* getter,
- OAuth2AccessTokenConsumer* consumer) OVERRIDE {
+ OAuth2AccessTokenConsumer* consumer) override {
std::map<std::string, std::string>::const_iterator it =
refresh_tokens_.find(account_id);
DCHECK(it != refresh_tokens_.end());
@@ -93,14 +93,14 @@ class TestOAuth2TokenService : public OAuth2TokenService {
class OAuth2TokenServiceTest : public testing::Test {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
oauth2_service_.reset(
new TestOAuth2TokenService(new net::TestURLRequestContextGetter(
message_loop_.message_loop_proxy())));
account_id_ = "test_user@gmail.com";
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Makes sure that all the clean up tasks are run.
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « google_apis/gaia/oauth2_token_service_test_util.h ('k') | google_apis/gaia/ubertoken_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698