| Index: google_apis/gaia/oauth2_token_service_request_unittest.cc
|
| diff --git a/google_apis/gaia/oauth2_token_service_request_unittest.cc b/google_apis/gaia/oauth2_token_service_request_unittest.cc
|
| index 0cb08d33fb9a695a7bd133833287fe85967d077f..691c3542ee5b787dfb873a51829a7289fd409a91 100644
|
| --- a/google_apis/gaia/oauth2_token_service_request_unittest.cc
|
| +++ b/google_apis/gaia/oauth2_token_service_request_unittest.cc
|
| @@ -22,13 +22,13 @@ const char kScope[] = "SCOPE";
|
| class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
|
| public:
|
| TestingOAuth2TokenServiceConsumer();
|
| - virtual ~TestingOAuth2TokenServiceConsumer();
|
| + ~TestingOAuth2TokenServiceConsumer() override;
|
|
|
| - virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
|
| - const std::string& access_token,
|
| - const base::Time& expiration_time) override;
|
| - virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
|
| - const GoogleServiceAuthError& error) override;
|
| + void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
|
| + const std::string& access_token,
|
| + const base::Time& expiration_time) override;
|
| + void OnGetTokenFailure(const OAuth2TokenService::Request* request,
|
| + const GoogleServiceAuthError& error) override;
|
|
|
| int num_get_token_success_;
|
| int num_get_token_failure_;
|
| @@ -67,7 +67,7 @@ void TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(
|
| class MockOAuth2TokenService : public FakeOAuth2TokenService {
|
| public:
|
| MockOAuth2TokenService();
|
| - virtual ~MockOAuth2TokenService();
|
| + ~MockOAuth2TokenService() override;
|
|
|
| void SetResponse(const GoogleServiceAuthError& error,
|
| const std::string& access_token,
|
| @@ -80,17 +80,17 @@ class MockOAuth2TokenService : public FakeOAuth2TokenService {
|
| }
|
|
|
| protected:
|
| - virtual void FetchOAuth2Token(RequestImpl* request,
|
| - const std::string& account_id,
|
| - net::URLRequestContextGetter* getter,
|
| - const std::string& client_id,
|
| - const std::string& client_secret,
|
| - const ScopeSet& scopes) override;
|
| -
|
| - virtual void InvalidateOAuth2Token(const std::string& account_id,
|
| - const std::string& client_id,
|
| - const ScopeSet& scopes,
|
| - const std::string& access_token) override;
|
| + void FetchOAuth2Token(RequestImpl* request,
|
| + const std::string& account_id,
|
| + net::URLRequestContextGetter* getter,
|
| + const std::string& client_id,
|
| + const std::string& client_secret,
|
| + const ScopeSet& scopes) override;
|
| +
|
| + void InvalidateOAuth2Token(const std::string& account_id,
|
| + const std::string& client_id,
|
| + const ScopeSet& scopes,
|
| + const std::string& access_token) override;
|
|
|
| private:
|
| GoogleServiceAuthError response_error_;
|
| @@ -154,12 +154,12 @@ class OAuth2TokenServiceRequestTest : public testing::Test {
|
| Provider(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| OAuth2TokenService* token_service);
|
|
|
| - virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| - GetTokenServiceTaskRunner() override;
|
| - virtual OAuth2TokenService* GetTokenService() override;
|
| + scoped_refptr<base::SingleThreadTaskRunner> GetTokenServiceTaskRunner()
|
| + override;
|
| + OAuth2TokenService* GetTokenService() override;
|
|
|
| private:
|
| - virtual ~Provider();
|
| + ~Provider() override;
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| OAuth2TokenService* token_service_;
|
|
|