Delay fetching account info until OnRefreshTokensLoaded().

chrome/browser/android/signin/account_tracker_service_android.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/android/signin/account_tracker_service_android.h"
 
 #include "base/android/jni_array.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/account_fetcher_service_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
+#include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_info.h"
 #include "jni/AccountTrackerService_jni.h"
 
 AccountTrackerServiceAndroid::AccountTrackerServiceAndroid(JNIEnv* env,
-                                                           jobject obj) {
+                                                           jobject obj)
+    : seeded_accounts_info_(false) {
   java_account_tracker_service_.Reset(env, obj);
 }
 
 void AccountTrackerServiceAndroid::SeedAccountsInfo(JNIEnv* env,
                                                     jobject obj,
                                                     jobjectArray gaiaIds,
                                                     jobjectArray accountNames) {
   std::vector<std::string> gaia_ids;
   std::vector<std::string> account_names;
   base::android::AppendJavaStringArrayToStringVector(env, gaiaIds, &gaia_ids);
   base::android::AppendJavaStringArrayToStringVector(env, accountNames,
                                                      &account_names);
   DCHECK_EQ(gaia_ids.size(), account_names.size());
 
   DVLOG(1) << "AccountTrackerServiceAndroid::SeedAccountsInfo: "
            << " number of accounts " << gaia_ids.size();
   Profile* profile = ProfileManager::GetActiveUserProfile();
-  AccountTrackerService* account_tracker_service_ =
+  AccountTrackerService* account_tracker_service =
       AccountTrackerServiceFactory::GetForProfile(profile);
 
   for (unsigned int i = 0; i < gaia_ids.size(); i++) {
-    account_tracker_service_->SeedAccountInfo(gaia_ids[i], account_names[i]);
+    account_tracker_service->SeedAccountInfo(gaia_ids[i], account_names[i]);
   }
+  if (!seeded_accounts_info_)
+    AccountFetcherServiceFactory::GetForProfile(profile)

[Mike Lerman, 2015/10/01 13:54:44]

nit: add { and } for multi-line statement.

+        ->EnableNetworkFetches();
+  seeded_accounts_info_ = true;
 }

[Roger Tawa OOO till Jul 10th, 2015/10/01 14:17:38]

I suspect this could come up in other situations too (i.e. we need to seed ATS
earlier for some reason).  So I think it might be better to do the following:

- change AFS::EnableNetworkFetches() to be a noop instead of DCHECKing if it has
already been called.  This should be easy since it already maintains a bool

- no need for bool here, just unconditionally call EnableNetworkFetches()

- undo the change in profile_manager.cc

[anthonyvd, 2015/10/01 14:33:20]

Agreed that EnableNetworkFetches should be idempotent so removing the DCHECK and
no-op'ing when it was already called is probably the right thing to do. It won't
allow undoing the profile_manager.cc changes though (I think) since the goal is
to delay the call to after accounts are seeded.

 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   AccountTrackerServiceAndroid* account_tracker_service_android =
       new AccountTrackerServiceAndroid(env, obj);
   return reinterpret_cast<intptr_t>(account_tracker_service_android);
 }
 
 // static
 bool AccountTrackerServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }