easy-signin: Defer chrome restart until key ops finish.

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 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/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 204 matching lines @@
   registry->RegisterStringPref(prefs::kRLZBrand, std::string());
   registry->RegisterBooleanPref(prefs::kRLZDisabled, false);
 }
 
 UserSessionManager::UserSessionManager()
     : delegate_(NULL),
       has_auth_cookies_(false),
       user_sessions_restored_(false),
       exit_after_session_restore_(false),
       session_restore_strategy_(
-          OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN) {
+          OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN),
+      running_easy_unlock_key_ops_(false) {
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 UserSessionManager::~UserSessionManager() {
   // UserManager is destroyed before singletons, so we need to check if it
   // still exists.
   // TODO(nkostylev): fix order of destruction of UserManager
   // / UserSessionManager objects.
   if (user_manager::UserManager::IsInitialized())
@@ skipping 199 matching lines @@
   const bool enable_layouts =
       user_manager::UserManager::Get()->IsLoggedInAsGuest();
   locale_util::SwitchLanguage(pref_locale,
                               enable_layouts,
                               false /* login_layouts_only */,
                               callback.Pass());
 
   return true;
 }
 
+bool UserSessionManager::NeedsToUpdateEasyUnlockKeys() const {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+             chromeos::switches::kEnableEasySignin) &&
+         !user_context_.GetUserID().empty() &&
+         user_context_.GetUserType() == user_manager::USER_TYPE_REGULAR &&
+         user_context_.GetKey() && !user_context_.GetKey()->GetSecret().empty();
+}
+
+bool UserSessionManager::CheckEasyUnlockKeyOps(const base::Closure& callback) {
+  if (!running_easy_unlock_key_ops_)
+    return false;
+
+  // Assumes only one deferred callback is needed.
+  DCHECK(easy_unlock_key_ops_finished_callback_.is_null());
+
+  easy_unlock_key_ops_finished_callback_ = callback;
+  return true;
+}
+
 void UserSessionManager::AddSessionStateObserver(
     chromeos::UserSessionStateObserver* observer) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   session_state_observer_list_.AddObserver(observer);
 }
 
 void UserSessionManager::RemoveSessionStateObserver(
     chromeos::UserSessionStateObserver* observer) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   session_state_observer_list_.RemoveObserver(observer);
@@ skipping 324 matching lines @@
 
   // Initialize various services only for primary user.
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (user_manager->GetPrimaryUser() == user) {
     InitRlz(profile);
     InitializeCerts(profile);
     InitializeCRLSetFetcher(user);
   }
 
+  UpdateEasyUnlockKeys(profile);
+  user_context_.ClearSecrets();
+
   // TODO(nkostylev): This pointer should probably never be NULL, but it looks
   // like LoginUtilsImpl::OnProfileCreated() may be getting called before
   // UserSessionManager::PrepareProfile() has set |delegate_| when Chrome is
   // killed during shutdown in tests -- see http://crosbug.com/18269.  Replace
   // this 'if' statement with a CHECK(delegate_) once the underlying issue is
   // resolved.
   if (delegate_)
     delegate_->OnProfilePrepared(profile);
-
-  UpdateEasyUnlockKeys(profile);
-  user_context_.ClearSecrets();
 }
 
 void UserSessionManager::InitSessionRestoreStrategy() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   bool in_app_mode = chrome::IsRunningInForcedAppMode();
 
   // Are we in kiosk app mode?
   if (in_app_mode) {
     if (command_line->HasSwitch(::switches::kAppModeOAuth2Token)) {
       oauth2_refresh_token_ = command_line->GetSwitchValueASCII(
@@ skipping 203 matching lines @@
 
   // |user_context_| and |user_profile| must belong to the same user.
   DCHECK_EQ(SigninManagerFactory::GetForProfile(user_profile)
                 ->GetAuthenticatedAccountId(),
             user_context_.GetUserID());
 
   const base::ListValue* device_list = NULL;
   if (EasyUnlockService::Get(user_profile))
     device_list = EasyUnlockService::Get(user_profile)->GetRemoteDevices();
 
+  running_easy_unlock_key_ops_ = true;
   if (device_list) {
     easy_unlock_key_manager_->RefreshKeys(
         user_context_,
         *device_list,
-        EasyUnlockKeyManager::RefreshKeysCallback());
+        base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
+                   AsWeakPtr()));
   } else {
     easy_unlock_key_manager_->RemoveKeys(
-        user_context_, 0, EasyUnlockKeyManager::RemoveKeysCallback());
+        user_context_,
+        0,
+        base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
+                   AsWeakPtr()));
   }
 }
 
+void UserSessionManager::OnEasyUnlockKeyOpsFinished(bool success) {
+  running_easy_unlock_key_ops_ = false;
+  if (!easy_unlock_key_ops_finished_callback_.is_null())
+    easy_unlock_key_ops_finished_callback_.Run();
+}
+
 void UserSessionManager::ActiveUserChanged(
     const user_manager::User* active_user) {
   Profile* profile = ProfileHelper::Get()->GetProfileByUser(active_user);
   // If profile has not yet been initialized, delay initialization of IME.
   if (!profile)
     return;
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   manager->SetState(
@@ skipping 18 matching lines @@
     return NULL;
   }
 
   if (!easy_unlock_key_manager_)
     easy_unlock_key_manager_.reset(new EasyUnlockKeyManager);
 
   return easy_unlock_key_manager_.get();
 }
 
 }  // namespace chromeos