Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

 // Copyright (c) 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 "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_external_data_manager.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/mock_device_management_service.h"
 #include "chrome/browser/policy/cloud/mock_user_cloud_policy_store.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/policy/cloud/user_policy_signin_service_android.h"
-#include "chrome/browser/signin/android_profile_oauth2_token_service.h"
 #else
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
-#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #endif
 
 namespace em = enterprise_management;
 
 using testing::AnyNumber;
 using testing::Mock;
 using testing::_;
 
 namespace policy {
 
@@ skipping 24 matching lines @@
     // Allow signing out now.
     prohibit_signout_ = false;
     SignOut();
   }
 
   static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
     return new SigninManagerFake(static_cast<Profile*>(profile));
   }
 };
 
-#if defined(OS_ANDROID)
-// TODO(atwilson): Remove this when ProfileOAuth2TokenService supports
-// usernames.
-class FakeAndroidProfileOAuth2TokenService
-    : public AndroidProfileOAuth2TokenService {
- public:
-  explicit FakeAndroidProfileOAuth2TokenService(Profile* profile) {
-    Initialize(profile);
-  }
-
-  static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
-    return new FakeAndroidProfileOAuth2TokenService(
-        static_cast<Profile*>(profile));
-  }
-
-  // AndroidProfileOAuth2TokenService overrides:
-  virtual void FetchOAuth2TokenWithUsername(
-      RequestImpl* request,
-      const std::string& username,
-      const OAuth2TokenService::ScopeSet& scope) OVERRIDE {
-    ASSERT_TRUE(!HasPendingRequest());
-    ASSERT_EQ(kTestUser, username);
-    ASSERT_EQ(2U, scope.size());
-    EXPECT_EQ(1U, scope.count(GaiaConstants::kDeviceManagementServiceOAuth));
-    EXPECT_EQ(1U, scope.count(
-        "https://www.googleapis.com/auth/userinfo.email"));
-    pending_request_ = request->AsWeakPtr();
-  }
-
-  void IssueToken(const std::string& token) {
-    ASSERT_TRUE(HasPendingRequest());
-    GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
-    if (token.empty())
-      error = GoogleServiceAuthError::FromServiceError("fail");
-    if (pending_request_) {
-      pending_request_->InformConsumer(
-          error,
-          token,
-          base::Time::Now() + base::TimeDelta::FromDays(1));
-    }
-    pending_request_.reset();
-  }
-
-  bool HasPendingRequest() const {
-    return pending_request_;
-  }
-
- private:
-  base::WeakPtr<RequestImpl> pending_request_;
-};
-
-#endif
-
 class UserPolicySigninServiceTest : public testing::Test {
  public:
   UserPolicySigninServiceTest()
       : mock_store_(NULL),
         thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         register_completed_(false) {}
 
   MOCK_METHOD1(OnPolicyRefresh, void(bool));
 
   void OnRegisterCompleted(scoped_ptr<CloudPolicyClient> client) {
     register_completed_ = true;
     created_client_.swap(client);
   }
 
   void RegisterPolicyClientWithCallback(UserPolicySigninService* service) {
+    // Policy client registration on Android depends on Token Service having
+    // a valid login token, while on other platforms, the login refresh token
+    // is specified directly.
+#if defined(OS_ANDROID)
+    GetTokenService()->IssueRefreshToken("oauth2_login_refresh_token");
+#endif
     service->RegisterPolicyClient(
         kTestUser,
 #if !defined(OS_ANDROID)
         "mock_oauth_token",
 #endif
         base::Bind(&UserPolicySigninServiceTest::OnRegisterCompleted,
                    base::Unretained(this)));
     ASSERT_TRUE(IsRequestActive());
   }
 
@@ skipping 11 matching lines @@
 
     // Create a testing profile with cloud-policy-on-signin enabled, and bring
     // up a UserCloudPolicyManager with a MockUserCloudPolicyStore.
     scoped_ptr<TestingPrefServiceSyncable> prefs(
         new TestingPrefServiceSyncable());
     chrome::RegisterUserProfilePrefs(prefs->registry());
     TestingProfile::Builder builder;
     builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               SigninManagerFake::Build);
-#if defined(OS_ANDROID)
-    builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
-                              FakeAndroidProfileOAuth2TokenService::Build);
-#else
     builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
                               FakeProfileOAuth2TokenService::Build);
-#endif
 
     profile_ = builder.Build().Pass();
     signin_manager_ = static_cast<SigninManagerFake*>(
         SigninManagerFactory::GetForProfile(profile_.get()));
 
     mock_store_ = new MockUserCloudPolicyStore();
     EXPECT_CALL(*mock_store_, Load()).Times(AnyNumber());
     manager_.reset(new UserCloudPolicyManager(
         profile_.get(),
         scoped_ptr<UserCloudPolicyStore>(mock_store_),
@@ skipping 10 matching lines @@
     profile_.reset();
     TestingBrowserProcess* testing_browser_process =
         TestingBrowserProcess::GetGlobal();
     testing_browser_process->SetLocalState(NULL);
     local_state_.reset();
     testing_browser_process->SetBrowserPolicyConnector(NULL);
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
 
-#if defined(OS_ANDROID)
-  FakeAndroidProfileOAuth2TokenService* GetTokenService() {
-    ProfileOAuth2TokenService* service =
-        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
-    return static_cast<FakeAndroidProfileOAuth2TokenService*>(service);
-  }
-#else
   FakeProfileOAuth2TokenService* GetTokenService() {
     ProfileOAuth2TokenService* service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     return static_cast<FakeProfileOAuth2TokenService*>(service);
   }
-#endif
 
   bool IsRequestActive() {
-#if defined(OS_ANDROID)
-    if (GetTokenService()->HasPendingRequest())
-      return true;
-#else
     if (!GetTokenService()->GetPendingRequests().empty())
       return true;
-#endif
     return url_factory_.GetFetcherByID(0);
   }
 
   void MakeOAuthTokenFetchSucceed() {
+    ASSERT_TRUE(IsRequestActive());
 #if defined(OS_ANDROID)
-    ASSERT_TRUE(GetTokenService()->HasPendingRequest());
-    GetTokenService()->IssueToken("fake_token");
+    GetTokenService()->IssueTokenForAllPendingRequests("access_token",
+                                                       base::Time::Now());
 #else
-    ASSERT_TRUE(IsRequestActive());
     net::TestURLFetcher* fetcher = url_factory_.GetFetcherByID(0);
     fetcher->set_response_code(net::HTTP_OK);
     fetcher->SetResponseString(kValidTokenResponse);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 #endif
   }
 
   void ReportHostedDomainStatus(bool is_hosted_domain) {
     ASSERT_TRUE(IsRequestActive());
     net::TestURLFetcher* fetcher = url_factory_.GetFetcherByID(0);
@@ skipping 350 matching lines @@
   RegisterPolicyClientWithCallback(signin_service);
   Mock::VerifyAndClearExpectations(this);
 
   // UserCloudPolicyManager should not be initialized.
   ASSERT_FALSE(manager_->core()->service());
   ASSERT_TRUE(IsRequestActive());
   EXPECT_FALSE(register_completed_);
 
   // Cause the access token fetch to fail - callback should be invoked.
 #if defined(OS_ANDROID)
-  ASSERT_TRUE(GetTokenService()->HasPendingRequest());
-  GetTokenService()->IssueToken("");
+  ASSERT_TRUE(!GetTokenService()->GetPendingRequests().empty());
+  GetTokenService()->IssueErrorForAllPendingRequests(
+      GoogleServiceAuthError::FromServiceError("fail"));
 #else
   net::TestURLFetcher* fetcher = url_factory_.GetFetcherByID(0);
   fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED, -1));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 #endif
 
   EXPECT_TRUE(register_completed_);
   EXPECT_FALSE(created_client_.get());
   EXPECT_FALSE(IsRequestActive());
 }
@@ skipping 200 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy