Load credentials on desktop even when there is no authenticated account ID.

chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

 // Copyright 2015 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/mutable_profile_oauth2_token_service_delegate.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 262 matching lines @@
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::LoadCredentials(
     const std::string& primary_account_id) {
   if (load_credentials_state_ == LOAD_CREDENTIALS_IN_PROGRESS) {
     VLOG(1) << "Load credentials operation already in progress";
     return;
   }
 
   load_credentials_state_ = LOAD_CREDENTIALS_IN_PROGRESS;
-  if (primary_account_id.empty()) {
+  if (primary_account_id.empty() &&
+      !switches::IsAccountConsistencyDiceEnabled()) {
     load_credentials_state_ = LOAD_CREDENTIALS_FINISHED_WITH_SUCCESS;
     FireRefreshTokensLoaded();
     return;
   }
 
-  ValidateAccountId(primary_account_id);
+  if (!primary_account_id.empty())
+    ValidateAccountId(primary_account_id);
   DCHECK(loading_primary_account_id_.empty());
   DCHECK_EQ(0, web_data_service_request_);
 
   refresh_tokens_.clear();
 
   scoped_refptr<TokenWebData> token_web_data = client_->GetDatabase();
   if (!token_web_data) {
     // This case only exists in unit tests that do not care about loading
     // credentials.
     load_credentials_state_ = LOAD_CREDENTIALS_FINISHED_WITH_UNKNOWN_ERRORS;
     FireRefreshTokensLoaded();
     return;
   }
 
-  // If the account_id is an email address, then canonicalize it.  This
-  // is to support legacy account_ids, and will not be needed after
-  // switching to gaia-ids.
-  if (primary_account_id.find('@') != std::string::npos) {
-    loading_primary_account_id_ = gaia::CanonicalizeEmail(primary_account_id);
-  } else {
-    loading_primary_account_id_ = primary_account_id;
+  if (!primary_account_id.empty()) {
+    // If the account_id is an email address, then canonicalize it.  This
+    // is to support legacy account_ids, and will not be needed after
+    // switching to gaia-ids.
+    if (primary_account_id.find('@') != std::string::npos) {
+      loading_primary_account_id_ = gaia::CanonicalizeEmail(primary_account_id);
+    } else {
+      loading_primary_account_id_ = primary_account_id;
+    }
   }
 
   web_data_service_request_ = token_web_data->GetAllTokens(this);
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle handle,
     std::unique_ptr<WDTypedResult> result) {
   VLOG(1) << "MutablePO2TS::OnWebDataServiceRequestDone. Result type: "
           << (result.get() == nullptr ? -1 : (int)result->GetType());
@@ skipping 15 matching lines @@
     load_credentials_state_ =
         LoadCredentialsStateFromTokenResult(token_result->GetValue().db_result);
   } else {
     load_credentials_state_ = LOAD_CREDENTIALS_FINISHED_WITH_UNKNOWN_ERRORS;
   }
   FireRefreshTokensLoaded();
 
   // Make sure that we have an entry for |loading_primary_account_id_| in the
   // map.  The entry could be missing if there is a corruption in the token DB
   // while this profile is connected to an account.
-  DCHECK(!loading_primary_account_id_.empty());
-  if (refresh_tokens_.count(loading_primary_account_id_) == 0) {
+  DCHECK(!loading_primary_account_id_.empty() ||
+         switches::IsAccountConsistencyDiceEnabled());
+  if (!loading_primary_account_id_.empty() &&
+      refresh_tokens_.count(loading_primary_account_id_) == 0) {
     refresh_tokens_[loading_primary_account_id_].reset(new AccountStatus(
         signin_error_controller_, loading_primary_account_id_, std::string()));
   }
 
   // If we don't have a refresh token for a known account, signal an error.
   for (auto& token : refresh_tokens_) {
     if (!RefreshTokenIsAvailable(token.first)) {
       UpdateAuthError(token.first,
                       GoogleServiceAuthError(
                           GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
@@ skipping 63 matching lines @@
           if (canon_account_id != account_id) {
             ClearPersistedCredentials(account_id);
             if (db_tokens.count(ApplyAccountIdPrefix(canon_account_id)) == 0)
               PersistCredentials(canon_account_id, refresh_token);
           }
 
           account_id = canon_account_id;
         }
 
         // Only load secondary accounts when account consistency is enabled.
-        if (switches::IsAccountConsistencyMirrorEnabled() ||
-            account_id == loading_primary_account_id_) {
+        if (account_id == loading_primary_account_id_ ||
+            switches::IsAccountConsistencyDiceEnabled() ||
+            switches::IsAccountConsistencyMirrorEnabled()) {
           refresh_tokens_[account_id].reset(new AccountStatus(
               signin_error_controller_, account_id, refresh_token));
           FireRefreshTokenAvailable(account_id);
         } else {
           RevokeCredentialsOnServer(refresh_token);
           ClearPersistedCredentials(account_id);
           FireRefreshTokenRevoked(account_id);
         }
       }
     }
@@ skipping 128 matching lines @@
     net::NetworkChangeNotifier::ConnectionType type) {
   // If our network has changed, reset the backoff timer so that errors caused
   // by a previous lack of network connectivity don't prevent new requests.
   backoff_entry_.Reset();
 }
 
 const net::BackoffEntry*
     MutableProfileOAuth2TokenServiceDelegate::BackoffEntry() const {
   return &backoff_entry_;
 }