Delay fetching account info until OnRefreshTokensLoaded().

chrome/browser/signin/account_fetcher_service_factory.cc

Index: chrome/browser/signin/account_fetcher_service_factory.cc
diff --git a/chrome/browser/signin/account_fetcher_service_factory.cc b/chrome/browser/signin/account_fetcher_service_factory.cc
index c6911aeedfca77682408d45aeecb9763947e3b31..4390f63a1fe174ffd32eac94ebed9d85a2f36c5e 100644
--- a/chrome/browser/signin/account_fetcher_service_factory.cc
+++ b/chrome/browser/signin/account_fetcher_service_factory.cc
@@ -4,13 +4,10 @@
 
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
 
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "components/invalidation/impl/profile_invalidation_provider.h"
-#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ -22,7 +19,6 @@ AccountFetcherServiceFactory::AccountFetcherServiceFactory()
   DependsOn(AccountTrackerServiceFactory::GetInstance());
   DependsOn(ChromeSigninClientFactory::GetInstance());
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
-  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
 }
 
 AccountFetcherServiceFactory::~AccountFetcherServiceFactory() {}
@@ -48,16 +44,10 @@ KeyedService* AccountFetcherServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
   AccountFetcherService* service = new AccountFetcherService();
-  invalidation::ProfileInvalidationProvider* invalidation_provider =
-      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile);
-  // Chrome OS login and guest profiles do not support invalidation. This is
-  // fine as they do not have GAIA credentials anyway. http://crbug.com/358169
-  invalidation::InvalidationService* invalidation_service =
-      invalidation_provider ? invalidation_provider->GetInvalidationService()
-                            : nullptr;
   service->Initialize(ChromeSigninClientFactory::GetForProfile(profile),
                       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-                      AccountTrackerServiceFactory::GetForProfile(profile),
-                      invalidation_service);
+                      AccountTrackerServiceFactory::GetForProfile(profile));
+  if (profile->AsTestingProfile() != nullptr)
+    service->DisableScheduledRefreshForTesting();
   return service;
 }