cros: Fix session restore on connection change.

chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
index fb8742053720e7519fffdfe72b5c4bf943611dd4..890bd89ac1bf289dce49121aae4e8b281c0e8f79 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
@@ -72,11 +72,11 @@ void OAuth2LoginManager::RestoreSession(
   refresh_token_ = oauth2_refresh_token;
   oauthlogin_access_token_ = oauth2_access_token;
   session_restore_start_ = base::Time::Now();
-  SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_PREPARING);
   ContinueSessionRestore();
 }
 
 void OAuth2LoginManager::ContinueSessionRestore() {
+  SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_PREPARING);
   if (restore_strategy_ == RESTORE_FROM_COOKIE_JAR) {
     FetchOAuth2Tokens();
     return;
@@ -119,11 +119,15 @@ void OAuth2LoginManager::Stop() {
   login_verifier_.reset();
 }
 
-bool OAuth2LoginManager::ShouldBlockTabLoading() {
+bool OAuth2LoginManager::SessionRestoreIsRunning() const {
   return state_ == SESSION_RESTORE_PREPARING ||
          state_ == SESSION_RESTORE_IN_PROGRESS;
 }
 
+bool OAuth2LoginManager::ShouldBlockTabLoading() const {
+  return SessionRestoreIsRunning();
+}
+
 void OAuth2LoginManager::OnRefreshTokenAvailable(
     const std::string& account_id) {
   VLOG(1) << "OnRefreshTokenAvailable";