Delay fetching account info until OnRefreshTokensLoaded().

components/signin/core/browser/child_account_info_fetcher_impl.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 "components/signin/core/browser/child_account_info_fetcher_impl.h"
 
 #include "base/strings/string_split.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "components/invalidation/public/invalidation_service.h"
@@ skipping 56 matching lines @@
     bool insert_success =
         invalidation_service_->UpdateRegisteredInvalidationIds(this, ids);
     DCHECK(insert_success);
   }
   FetchIfNotInProgress();
 }
 
 ChildAccountInfoFetcherImpl::~ChildAccountInfoFetcherImpl() {
   TRACE_EVENT_ASYNC_END0("AccountFetcherService", kFetcherId, this);
   if (invalidation_service_)
-    invalidation_service_->UnregisterInvalidationHandler(this);
+    UnregisterInvalidationHandler();
 }
 
 void ChildAccountInfoFetcherImpl::FetchIfNotInProgress() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (fetch_in_progress_)
     return;
   fetch_in_progress_ = true;
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kOAuth1LoginScope);
   login_token_request_.reset(
@@ skipping 42 matching lines @@
         std::find(service_flags.begin(), service_flags.end(),
                   AccountTrackerService::kChildAccountServiceFlag) !=
         service_flags.end();
     if (!is_child_account && invalidation_service_) {
       // Don't bother listening for invalidations as a non-child account can't
       // become a child account.
       bool insert_success =
           invalidation_service_->UpdateRegisteredInvalidationIds(
               this, syncer::ObjectIdSet());
       DCHECK(insert_success);
-      invalidation_service_->UnregisterInvalidationHandler(this);
-      invalidation_service_ = nullptr;
+      UnregisterInvalidationHandler();
     }
     fetcher_service_->SetIsChildAccount(account_id_, is_child_account);
   } else {
     DLOG(ERROR) << "ChildAccountInfoFetcherImpl::OnGetUserInfoSuccess: "
                 << "GetUserInfo response didn't include allServices field.";
   }
   fetch_in_progress_ = false;
 }
 
 void ChildAccountInfoFetcherImpl::OnGetUserInfoFailure(
     const GoogleServiceAuthError& error) {
   HandleFailure();
 }
 
 void ChildAccountInfoFetcherImpl::HandleFailure() {
   fetch_in_progress_ = false;
   backoff_.InformOfRequest(false);
   timer_.Start(FROM_HERE, backoff_.GetTimeUntilRelease(), this,
                &ChildAccountInfoFetcherImpl::FetchIfNotInProgress);
 }
 
+void ChildAccountInfoFetcherImpl::UnregisterInvalidationHandler() {
+  invalidation_service_->UnregisterInvalidationHandler(this);
+  invalidation_service_ = nullptr;
+}
+
 void ChildAccountInfoFetcherImpl::OnInvalidatorStateChange(
     syncer::InvalidatorState state) {
+  if (state == syncer::INVALIDATOR_SHUTTING_DOWN)
+    UnregisterInvalidationHandler();
 }
 
 void ChildAccountInfoFetcherImpl::OnIncomingInvalidation(
     const syncer::ObjectIdInvalidationMap& invalidation_map) {
   FetchIfNotInProgress();
   invalidation_map.AcknowledgeAll();
 }
 
 std::string ChildAccountInfoFetcherImpl::GetOwnerName() const {
   return std::string(kFetcherId);
 }