Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/account_reconcilor.cc

 // Copyright 2013 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 "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_reconcilor.h"
 #include "chrome/browser/signin/google_auto_login_helper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 AccountReconcilor::AccountReconcilor(Profile* profile)
     : profile_(profile),
       are_gaia_accounts_set_(false),
       requests_(NULL) {
+  DVLOG(1) << "AccountReconcilor::AccountReconcilor";
   RegisterWithSigninManager();
   RegisterWithCookieMonster();
 
   // If this profile is not connected, the reconcilor should do nothing but
   // wait for the connection.
   if (IsProfileConnected()) {
     RegisterWithTokenService();
     StartPeriodicReconciliation();
   }
 }
@@ skipping 36 matching lines @@
 }
 
 void AccountReconcilor::UnregisterWithSigninManager() {
   content::Source<Profile> source(profile_);
   registrar_.Remove(
       this, chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL, source);
   registrar_.Remove(this, chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, source);
 }
 
 void AccountReconcilor::RegisterWithTokenService() {
+  DVLOG(1) << "AccountReconcilor::RegisterWithTokenService";
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   token_service->AddObserver(this);
 }
 
 void AccountReconcilor::UnregisterWithTokenService() {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   token_service->RemoveObserver(this);
 }
@@ skipping 220 matching lines @@
         have_same_accounts = false;
         break;
       }
     }
   }
 
   if (!are_primaries_equal || !have_same_accounts) {
     // TODO(rogerta): fix things up.
   }
 }