Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / google_apis / gaia / oauth2_token_service_request_unittest.cc

diff --git a/src/google_apis/gaia/oauth2_token_service_request_unittest.cc b/src/google_apis/gaia/oauth2_token_service_request_unittest.cc
index c2683a8..a3ec9b5 100644 (file)
--- a/src/google_apis/gaia/oauth2_token_service_request_unittest.cc
+++ b/src/google_apis/gaia/oauth2_token_service_request_unittest.cc
@@ -7,6 +7,8 @@
 #include <set>
 #include <string>
 #include <vector>
+
+#include "base/bind.h"
 #include "base/threading/thread.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
@@ -22,13 +24,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 +69,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 +82,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_;
@@ -145,8 +147,8 @@ void MockOAuth2TokenService::InvalidateOAuth2Token(
 
 class OAuth2TokenServiceRequestTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   class Provider : public OAuth2TokenServiceRequest::TokenServiceProvider {
@@ -154,12 +156,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_;