Refactor OAuth2TokenService to have profile- and device-based implementations.

chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc

Index: chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
diff --git a/chrome/browser/signin/oauth2_token_service_request_unittest.cc b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
similarity index 64%
rename from chrome/browser/signin/oauth2_token_service_request_unittest.cc
rename to chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
index 83b92a1b47d05091b53c2105a3e49538105e68a7..184c7b2a73258608d183a9caae9c8f3045610337 100644
--- a/chrome/browser/signin/oauth2_token_service_request_unittest.cc
+++ b/chrome/browser/signin/profile_oauth2_token_service_request_unittest.cc
@@ -1,14 +1,15 @@
 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#include "chrome/browser/signin/oauth2_token_service_request.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_request.h"
 
 #include <set>
 #include <string>
 #include <vector>
 #include "base/threading/thread.h"
 #include "chrome/browser/signin/oauth2_token_service.h"
-#include "chrome/browser/signin/oauth2_token_service_factory.h"
+#include "chrome/browser/signin/profile_oauth2_token_service.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ -29,13 +30,13 @@ class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
   std::string last_token_;
-  int number_of_correct_tokens_;
+  int number_of_successful_tokens_;
   GoogleServiceAuthError last_error_;
   int number_of_errors_;
 };
 
 TestingOAuth2TokenServiceConsumer::TestingOAuth2TokenServiceConsumer()
-    : number_of_correct_tokens_(0),
+    : number_of_successful_tokens_(0),
       last_error_(GoogleServiceAuthError::AuthErrorNone()),
       number_of_errors_(0) {
 }
@@ -48,7 +49,7 @@ void TestingOAuth2TokenServiceConsumer::OnGetTokenSuccess(
     const std::string& token,
     const base::Time& expiration_date) {
   last_token_ = token;
-  ++number_of_correct_tokens_;
+  ++number_of_successful_tokens_;
 }
 
 void TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(
@@ -58,7 +59,7 @@ void TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(
   ++number_of_errors_;
 }
 
-class MockOAuth2TokenService : public OAuth2TokenService {
+class MockProfileOAuth2TokenService : public ProfileOAuth2TokenService {
  public:
   class Request : public OAuth2TokenService::Request,
                   public base::SupportsWeakPtr<Request> {
@@ -77,8 +78,8 @@ class MockOAuth2TokenService : public OAuth2TokenService {
     base::Time expiration_date_;
   };
 
-  MockOAuth2TokenService();
-  virtual ~MockOAuth2TokenService();
+  MockProfileOAuth2TokenService();
+  virtual ~MockProfileOAuth2TokenService();
 
   virtual scoped_ptr<OAuth2TokenService::Request> StartRequest(
       const std::set<std::string>& scopes,
@@ -88,13 +89,13 @@ class MockOAuth2TokenService : public OAuth2TokenService {
 
  private:
   static void InformConsumer(
-      base::WeakPtr<MockOAuth2TokenService::Request> request);
+      base::WeakPtr<MockProfileOAuth2TokenService::Request> request);
 
   bool success_;
   std::string oauth2_access_token_;
 };
 
-MockOAuth2TokenService::Request::Request(
+MockProfileOAuth2TokenService::Request::Request(
     OAuth2TokenService::Consumer* consumer,
     GoogleServiceAuthError error,
     std::string access_token)
@@ -103,62 +104,64 @@ MockOAuth2TokenService::Request::Request(
       access_token_(access_token) {
 }
 
-MockOAuth2TokenService::Request::~Request() {
+MockProfileOAuth2TokenService::Request::~Request() {
 }
 
-void MockOAuth2TokenService::Request::InformConsumer() const {
+void MockProfileOAuth2TokenService::Request::InformConsumer() const {
   if (error_.state() == GoogleServiceAuthError::NONE)
     consumer_->OnGetTokenSuccess(this, access_token_, expiration_date_);
   else
     consumer_->OnGetTokenFailure(this, error_);
 }
 
-MockOAuth2TokenService::MockOAuth2TokenService()
-    : success_(true),
+MockProfileOAuth2TokenService::MockProfileOAuth2TokenService()
+    : ProfileOAuth2TokenService(NULL /* URLRequestContextGetter */),
+      success_(true),
       oauth2_access_token_(std::string("success token")) {
 }
 
-MockOAuth2TokenService::~MockOAuth2TokenService() {
+MockProfileOAuth2TokenService::~MockProfileOAuth2TokenService() {
 }
 
-void MockOAuth2TokenService::SetExpectation(bool success,
+void MockProfileOAuth2TokenService::SetExpectation(bool success,
                                             std::string oauth2_access_token) {
   success_ = success;
   oauth2_access_token_ = oauth2_access_token;
 }
 
 // static
-void MockOAuth2TokenService::InformConsumer(
-    base::WeakPtr<MockOAuth2TokenService::Request> request) {
+void MockProfileOAuth2TokenService::InformConsumer(
+    base::WeakPtr<MockProfileOAuth2TokenService::Request> request) {
   if (request)
     request->InformConsumer();
 }
 
-scoped_ptr<OAuth2TokenService::Request> MockOAuth2TokenService::StartRequest(
-    const std::set<std::string>& scopes,
-    OAuth2TokenService::Consumer* consumer) {
+scoped_ptr<OAuth2TokenService::Request>
+    MockProfileOAuth2TokenService::StartRequest(
+        const std::set<std::string>& scopes,
+        OAuth2TokenService::Consumer* consumer) {
   scoped_ptr<Request> request;
   if (success_) {
-    request.reset(new MockOAuth2TokenService::Request(
+    request.reset(new MockProfileOAuth2TokenService::Request(
         consumer,
         GoogleServiceAuthError(GoogleServiceAuthError::NONE),
         oauth2_access_token_));
   } else {
-    request.reset(new MockOAuth2TokenService::Request(
+    request.reset(new MockProfileOAuth2TokenService::Request(
         consumer,
         GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE),
         std::string()));
   }
   MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
-    &MockOAuth2TokenService::InformConsumer, request->AsWeakPtr()));
+    &MockProfileOAuth2TokenService::InformConsumer, request->AsWeakPtr()));
   return request.PassAs<OAuth2TokenService::Request>();
 }
 
 static ProfileKeyedService* CreateOAuth2TokenService(Profile* profile) {
-  return new MockOAuth2TokenService();
+  return new MockProfileOAuth2TokenService();
 }
 
-class OAuth2TokenServiceRequestTest : public testing::Test {
+class ProfileOAuth2TokenServiceRequestTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE;
 
@@ -168,70 +171,70 @@ class OAuth2TokenServiceRequestTest : public testing::Test {
 
   scoped_ptr<Profile> profile_;
   TestingOAuth2TokenServiceConsumer consumer_;
-  MockOAuth2TokenService* oauth2_service_;
+  MockProfileOAuth2TokenService* oauth2_service_;
 
-  scoped_ptr<OAuth2TokenServiceRequest> request_;
+  scoped_ptr<ProfileOAuth2TokenServiceRequest> request_;
 };
 
-void OAuth2TokenServiceRequestTest::SetUp() {
+void ProfileOAuth2TokenServiceRequestTest::SetUp() {
   ui_thread_.reset(new content::TestBrowserThread(content::BrowserThread::UI,
                                                   &ui_loop_));
   profile_.reset(new TestingProfile());
-  OAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
+  ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
       profile_.get(), &CreateOAuth2TokenService);
-  oauth2_service_ = (MockOAuth2TokenService*)
-      OAuth2TokenServiceFactory::GetForProfile(profile_.get());
+  oauth2_service_ = (MockProfileOAuth2TokenService*)
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
 }
 
-TEST_F(OAuth2TokenServiceRequestTest,
+TEST_F(ProfileOAuth2TokenServiceRequestTest,
        Failure) {
   oauth2_service_->SetExpectation(false, std::string());
-  scoped_ptr<OAuth2TokenServiceRequest> request(
-      OAuth2TokenServiceRequest::CreateAndStart(
+  scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
+      ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
           std::set<std::string>(),
           &consumer_));
   ui_loop_.RunUntilIdle();
-  EXPECT_EQ(0, consumer_.number_of_correct_tokens_);
+  EXPECT_EQ(0, consumer_.number_of_successful_tokens_);
   EXPECT_EQ(1, consumer_.number_of_errors_);
 }
 
-TEST_F(OAuth2TokenServiceRequestTest,
+TEST_F(ProfileOAuth2TokenServiceRequestTest,
        Success) {
-  scoped_ptr<OAuth2TokenServiceRequest> request(
-      OAuth2TokenServiceRequest::CreateAndStart(
+  scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
+      ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
           std::set<std::string>(),
           &consumer_));
   ui_loop_.RunUntilIdle();
-  EXPECT_EQ(1, consumer_.number_of_correct_tokens_);
+  EXPECT_EQ(1, consumer_.number_of_successful_tokens_);
   EXPECT_EQ("success token", consumer_.last_token_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
 }
 
-TEST_F(OAuth2TokenServiceRequestTest,
+TEST_F(ProfileOAuth2TokenServiceRequestTest,
        RequestDeletionBeforeServiceComplete) {
-  scoped_ptr<OAuth2TokenServiceRequest> request(
-      OAuth2TokenServiceRequest::CreateAndStart(
+  scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
+      ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
           std::set<std::string>(),
           &consumer_));
   request.reset();
   ui_loop_.RunUntilIdle();
-  EXPECT_EQ(0, consumer_.number_of_correct_tokens_);
+  EXPECT_EQ(0, consumer_.number_of_successful_tokens_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
 }
 
-TEST_F(OAuth2TokenServiceRequestTest,
+TEST_F(ProfileOAuth2TokenServiceRequestTest,
        RequestDeletionAfterServiceComplete) {
-  scoped_ptr<OAuth2TokenServiceRequest> request(
-      OAuth2TokenServiceRequest::CreateAndStart(
+  scoped_ptr<ProfileOAuth2TokenServiceRequest> request(
+      ProfileOAuth2TokenServiceRequest::CreateAndStart(
           profile_.get(),
           std::set<std::string>(),
           &consumer_));
   ui_loop_.RunUntilIdle();
   request.reset();
-  EXPECT_EQ(1, consumer_.number_of_correct_tokens_);
+  EXPECT_EQ(1, consumer_.number_of_successful_tokens_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
 }