IdentityTestEnvironment: Add MakeAccountAvailable() API

This API allows test clients to populate an account from an email
address with IdentityManager and its backing classes. It is conceptually
similar to IdentityTestEnvironment::MakePrimaryAccountAvailable().

Bug: 798699
Change-Id: Iffaae9f989a37de3e406ccc10166ce44c7ed6bdb
Reviewed-on: https://chromium-review.googlesource.com/1099057
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567221}

services/identity/public/cpp/identity_test_environment.cc

@@ -30,6 +30,8 @@ class IdentityTestEnvironmentInternal {
   // The IdentityManager instance created and owned by this instance.
   IdentityManager* identity_manager();
 
+  AccountTrackerService* account_tracker_service();
+
   SigninManagerForTest* signin_manager();
 
   FakeProfileOAuth2TokenService* token_service();
@@ -73,6 +75,11 @@ IdentityManager* IdentityTestEnvironmentInternal::identity_manager() {
   return identity_manager_.get();
 }
 
+AccountTrackerService*
+IdentityTestEnvironmentInternal::account_tracker_service() {
+  return &account_tracker_;
+}
+
 SigninManagerForTest* IdentityTestEnvironmentInternal::signin_manager() {
   return &signin_manager_;
 }
@@ -128,6 +135,13 @@ void IdentityTestEnvironment::ClearPrimaryAccount() {
                                 internals_->identity_manager());
 }
 
+std::string IdentityTestEnvironment::MakeAccountAvailable(
+    const std::string& email) {
+  return identity::MakeAccountAvailable(internals_->account_tracker_service(),
+                                        internals_->token_service(),
+                                        internals_->identity_manager(), email);
+}
+
 void IdentityTestEnvironment::SetAutomaticIssueOfAccessTokens(bool grant) {
   internals_->token_service()->set_auto_post_fetch_response_on_message_loop(
       grant);

services/identity/public/cpp/identity_test_environment.h

@@ -54,6 +54,12 @@ class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
   // primary account is cleared.
   void ClearPrimaryAccount();
 
+  // Makes an account available for the given email address, generating a GAIA
+  // ID and refresh token that correspond uniquely to that email address. Blocks
+  // until the account is available. Returns the account ID of the
+  // newly-available account.
+  std::string MakeAccountAvailable(const std::string& email);
+
   // When this is set, access token requests will be automatically granted with
   // an access token value of "access_token".
   void SetAutomaticIssueOfAccessTokens(bool grant);

services/identity/public/cpp/identity_test_utils.cc

@@ -6,6 +6,7 @@
 
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "services/identity/public/cpp/identity_manager.h"
@@ -96,15 +97,12 @@ void OneShotIdentityManagerObserver::OnRefreshTokenRemovedForAccount(
   std::move(done_closure_).Run();
 }
 
-// Helper function that updates the refresh token for the primary account to
+// Helper function that updates the refresh token for |account_id| to
 // |new_token|. Blocks until the update is processed by |identity_manager|.
-void UpdateRefreshTokenForPrimaryAccount(
-    ProfileOAuth2TokenService* token_service,
-    IdentityManager* identity_manager,
-    const std::string& new_token) {
-  DCHECK(identity_manager->HasPrimaryAccount());
-  std::string account_id = identity_manager->GetPrimaryAccountInfo().account_id;
-
+void UpdateRefreshTokenForAccount(ProfileOAuth2TokenService* token_service,
+                                  IdentityManager* identity_manager,
+                                  const std::string& account_id,
+                                  const std::string& new_token) {
   base::RunLoop run_loop;
   OneShotIdentityManagerObserver token_updated_observer(
       identity_manager, run_loop.QuitClosure(),
@@ -164,15 +162,18 @@ void SetRefreshTokenForPrimaryAccount(ProfileOAuth2TokenService* token_service,
   std::string account_id = identity_manager->GetPrimaryAccountInfo().account_id;
 
   std::string refresh_token = "refresh_token_for_" + account_id;
-  UpdateRefreshTokenForPrimaryAccount(token_service, identity_manager,
-                                      refresh_token);
+  UpdateRefreshTokenForAccount(token_service, identity_manager, account_id,
+                               refresh_token);
 }
 
 void SetInvalidRefreshTokenForPrimaryAccount(
     ProfileOAuth2TokenService* token_service,
     IdentityManager* identity_manager) {
-  UpdateRefreshTokenForPrimaryAccount(
-      token_service, identity_manager,
+  DCHECK(identity_manager->HasPrimaryAccount());
+  std::string account_id = identity_manager->GetPrimaryAccountInfo().account_id;
+
+  UpdateRefreshTokenForAccount(
+      token_service, identity_manager, account_id,
       OAuth2TokenServiceDelegate::kInvalidRefreshToken);
 }
 
@@ -222,4 +223,24 @@ void ClearPrimaryAccount(SigninManagerForTest* signin_manager,
 #endif
 }
 
+std::string MakeAccountAvailable(AccountTrackerService* account_tracker_service,
+                                 ProfileOAuth2TokenService* token_service,
+                                 IdentityManager* identity_manager,
+                                 const std::string& email) {
+  DCHECK(account_tracker_service->FindAccountInfoByEmail(email).IsEmpty());
+
+  std::string gaia_id = "gaia_id_for_" + email;
+  account_tracker_service->SeedAccountInfo(gaia_id, email);
+
+  std::string account_id =
+      account_tracker_service->FindAccountInfoByEmail(email).account_id;
+  DCHECK(!account_id.empty());
+
+  std::string refresh_token = "refresh_token_for_" + account_id;
+  UpdateRefreshTokenForAccount(token_service, identity_manager, account_id,
+                               refresh_token);
+
+  return account_id;
+}
+
 }  // namespace identity

services/identity/public/cpp/identity_test_utils.h

@@ -9,6 +9,7 @@
 
 #include "build/build_config.h"
 
+class AccountTrackerService;
 class FakeSigninManagerBase;
 class FakeSigninManager;
 class ProfileOAuth2TokenService;
@@ -84,6 +85,16 @@ std::string MakePrimaryAccountAvailable(
 void ClearPrimaryAccount(SigninManagerForTest* signin_manager,
                          IdentityManager* identity_manager);
 
+// Makes an account available for the given email address, generating a GAIA ID
+// and refresh token that correspond uniquely to that email address. Blocks
+// until the account is available. Returns the account ID of the
+// newly-available account.
+// NOTE: See disclaimer at top of file re: direct usage.
+std::string MakeAccountAvailable(AccountTrackerService* account_tracker_service,
+                                 ProfileOAuth2TokenService* token_service,
+                                 IdentityManager* identity_manager,
+                                 const std::string& email);
+
 }  // namespace identity
 
 #endif  // SERVICES_IDENTITY_PUBLIC_CPP_IDENTITY_TEST_UTILS_H_