Remove explicit conversion from std::string to CoreAccountId.

This CL removes the explicit conversion from (and to) std::string and
CoreAccountId.

Bug: 959157

Change-Id: Ibfc5ca50bf595a089e63ed1462361cbe8a316001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1926482Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717650}

chrome/browser/android/consent_auditor/consent_auditor_bridge.cc

@@ -42,5 +42,6 @@ static void JNI_ConsentAuditorBridge_RecordConsent(
   }
   ConsentAuditorFactory::GetForProfile(
       ProfileAndroid::FromProfileAndroid(j_profile))
-      ->RecordSyncConsent(ConvertJavaStringToUTF8(j_account_id), sync_consent);
+      ->RecordSyncConsent(CoreAccountId(ConvertJavaStringToUTF8(j_account_id)),
+                          sync_consent);
 }

chrome/browser/android/signin/signin_investigator_android.cc

@@ -33,10 +33,10 @@ jint JNI_SigninInvestigator_Investigate(
       IdentityManagerFactory::GetForProfile(profile)
           ->FindExtendedAccountInfoForAccountWithRefreshTokenByEmailAddress(
               email);
-  std::string account_id;
+  std::string gaia_id;
   if (maybe_account_info.has_value())
-    account_id = maybe_account_info.value().account_id;
+    gaia_id = maybe_account_info.value().gaia;
 
   return static_cast<int>(
-      SigninInvestigator(email, account_id, &provider).Investigate());
+      SigninInvestigator(email, gaia_id, &provider).Investigate());
 }

chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc

@@ -64,7 +64,7 @@ void UserPolicySigninService::ShutdownUserCloudPolicyManager() {
 
 void UserPolicySigninService::RegisterForPolicyWithAccountId(
     const std::string& username,
-    const std::string& account_id,
+    const CoreAccountId& account_id,
     PolicyRegistrationCallback callback) {
   // Create a new CloudPolicyClient for fetching the DMToken.
   std::unique_ptr<CloudPolicyClient> policy_client =

chrome/browser/policy/cloud/user_policy_signin_service_mobile.h

@@ -51,7 +51,7 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
   // |callback| is invoked once we have registered this device to fetch policy,
   // or once it is determined that |username| is not a managed account.
   void RegisterForPolicyWithAccountId(const std::string& username,
-                                      const std::string& account_id,
+                                      const CoreAccountId& account_id,
                                       PolicyRegistrationCallback callback);
 
   // Overridden from UserPolicySigninServiceBase to cancel the pending delayed
@@ -59,11 +59,6 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
   void ShutdownUserCloudPolicyManager() override;
 
  private:
-  void RegisterForPolicyInternal(const std::string& username,
-                                 const std::string& account_id,
-                                 const std::string& access_token,
-                                 PolicyRegistrationCallback callback);
-
   void CallPolicyRegistrationCallback(std::unique_ptr<CloudPolicyClient> client,
                                       PolicyRegistrationCallback callback);
 

components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc

@@ -165,7 +165,7 @@ OAuth2TokenServiceDelegateAndroid::OAuth2TokenServiceDelegateAndroid(
       AccountInfo account_info =
           account_tracker_service_->FindAccountInfoByEmail(account_name.id);
       DCHECK(!account_info.gaia.empty());
-      accounts_id.push_back(account_info.gaia);
+      accounts_id.push_back(CoreAccountId(account_info.gaia));
     }
     SetAccounts(accounts_id);
   }
@@ -283,9 +283,8 @@ OAuth2TokenServiceDelegateAndroid::GetValidAccounts() {
 void OAuth2TokenServiceDelegateAndroid::SetAccounts(
     const std::vector<CoreAccountId>& accounts) {
   JNIEnv* env = AttachCurrentThread();
-  std::vector<std::string> str_ids(accounts.begin(), accounts.end());
   ScopedJavaLocalRef<jobjectArray> java_accounts(
-      base::android::ToJavaArrayOfStrings(env, str_ids));
+      base::android::ToJavaArrayOfStrings(env, ToStringList(accounts)));
   signin::Java_OAuth2TokenService_setAccounts(env, java_accounts);
 }
 

components/signin/internal/identity_manager/oauth2_token_service_delegate_android_unittest.cc

@@ -98,7 +98,7 @@ TEST_F(OAuth2TokenServiceDelegateAndroidTest,
        UpdateAccountListWith0SystemAccount0AccountAndNotSignedIn) {
   EXPECT_CALL(*delegate_, SetAccounts(kEmptyVector)).WillOnce(Return());
   // No observer call expected
-  delegate_->UpdateAccountList(std::string(), {}, {});
+  delegate_->UpdateAccountList(CoreAccountId(), {}, {});
   EXPECT_TRUE(account_tracker_service_.GetAccounts().empty());
 }
 
@@ -106,7 +106,7 @@ TEST_F(OAuth2TokenServiceDelegateAndroidTest,
        UpdateAccountListWith1SystemAccount0AccountAndNotSignedIn) {
   EXPECT_CALL(*delegate_, SetAccounts(kEmptyVector)).WillOnce(Return());
   // No observer call expected
-  delegate_->UpdateAccountList(std::string(), {}, {account1_.account_id});
+  delegate_->UpdateAccountList(CoreAccountId(), {}, {account1_.account_id});
   EXPECT_EQ(std::vector<AccountInfo>{account1_},
             account_tracker_service_.GetAccounts());
 }
@@ -122,7 +122,7 @@ TEST_F(OAuth2TokenServiceDelegateAndroidTest,
       .InSequence(seq)
       .WillOnce(Return());
 
-  delegate_->UpdateAccountList(std::string(), {account1_.account_id},
+  delegate_->UpdateAccountList(CoreAccountId(), {account1_.account_id},
                                {account1_.account_id});
   EXPECT_EQ(std::vector<AccountInfo>{account1_},
             account_tracker_service_.GetAccounts());

components/signin/public/identity_manager/identity_manager_unittest.cc

@@ -2318,7 +2318,7 @@ TEST_F(IdentityManagerTest, ForceRefreshOfExtendedAccountInfo) {
 
   SimulateSuccessfulFetchOfAccountInfo(
       identity_manager(), account_info.account_id, account_info.email,
-      account_info.account_id, kTestHostedDomain, kTestFullName, kTestGivenName,
+      account_info.gaia, kTestHostedDomain, kTestFullName, kTestGivenName,
       kTestLocale, kTestPictureUrl);
 
   const AccountInfo& refreshed_account_info =

components/signin/public/identity_manager/identity_mutator.cc

@@ -52,8 +52,7 @@ void JniIdentityMutator::ReloadAllAccountsFromSystemWithPrimaryAccount(
   DCHECK(device_accounts_synchronizer);
   base::Optional<CoreAccountId> primary_account_id;
   if (j_primary_account_id) {
-    primary_account_id = CoreAccountId();
-    primary_account_id->id =
+    primary_account_id =
         ConvertFromJavaCoreAccountId(env, j_primary_account_id);
   }
   device_accounts_synchronizer->ReloadAllAccountsFromSystemWithPrimaryAccount(

google_apis/gaia/core_account_id.cc

@@ -22,12 +22,6 @@ CoreAccountId::CoreAccountId(std::string&& id) : id(std::move(id)) {}
 
 CoreAccountId::CoreAccountId(const std::string& id) : id(id) {}
 
-#if defined(OS_ANDROID)
-CoreAccountId::operator std::string() const {
-  return id;
-}
-#endif
-
 bool CoreAccountId::empty() const {
   return id.empty();
 }

google_apis/gaia/core_account_id.h

@@ -24,19 +24,9 @@ struct CoreAccountId {
   CoreAccountId& operator=(const CoreAccountId&);
   CoreAccountId& operator=(CoreAccountId&&) noexcept;
 
-#if defined(OS_ANDROID)
-  // Those implicit constructor and conversion operator allow to
-  // progressively migrate the code to use this struct. Removing
-  // them is tracked by https://crbug.com/959161
-  CoreAccountId(const char* id);
-  CoreAccountId(std::string&& id);
-  CoreAccountId(const std::string& id);
-  operator std::string() const;
-#else
   explicit CoreAccountId(const char* id);
   explicit CoreAccountId(std::string&& id);
   explicit CoreAccountId(const std::string& id);
-#endif
 
   // Checks if the account is valid or not.
   // TODO(triploblastic): Possibly rename of remove this after