OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 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 "chrome/browser/chromeos/profiles/profile_helper.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace chromeos {
 
 namespace {
 
 base::FilePath GetSigninProfileDir() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath user_data_dir = profile_manager->user_data_dir();
   return user_data_dir.AppendASCII(chrome::kInitialProfile);
 }
 
 }  // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ProfileHelper, public
 
 ProfileHelper::ProfileHelper()
   : signin_profile_clear_requested_(false) {
 }
 
 ProfileHelper::~ProfileHelper() {
   // Checking whether UserManager is initialized covers case
   // when ScopedTestUserManager is used.
-  if (UserManager::IsInitialized()) {
-    UserManager::Get()->RemoveObserver(this);
+  if (UserManager::IsInitialized())
     UserManager::Get()->RemoveSessionStateObserver(this);
-  }
 }
 
 // static
 Profile* ProfileHelper::GetProfileByUserIdHash(
     const std::string& user_id_hash) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   return profile_manager->GetProfile(GetProfilePathByUserIdHash(user_id_hash));
 }
 
 // static
@@ skipping 34 matching lines @@
 
   return profile_dir.substr(prefix.length(),
                             profile_dir.length() - prefix.length());
 }
 
 // static
 bool ProfileHelper::IsSigninProfile(Profile* profile) {
   return profile->GetPath().BaseName().value() == chrome::kInitialProfile;
 }
 
-// static
 void ProfileHelper::ProfileStartup(Profile* profile, bool process_startup) {
   // Initialize Chrome OS preferences like touch pad sensitivity. For the
   // preferences to work in the guest mode, the initialization has to be
   // done after |profile| is switched to the incognito profile (which
   // is actually GuestSessionProfile in the guest mode). See the
   // GetOffTheRecordProfile() call above.
   profile->InitChromeOSPreferences();
 
-  if (process_startup) {
+  if (process_startup)
     profile->SetupChromeOSEnterpriseExtensionObserver();
+
+  // Add observer so we can see when the first profile's session restore is
+  // completed. After that, we won't need the default profile anymore.
+  if (!IsSigninProfile(profile) &&
+      UserManager::Get()->IsLoggedInAsRegularUser() &&
+      !UserManager::Get()->IsLoggedInAsStub()) {
+    chromeos::OAuth2LoginManager* login_manager =
+        chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
+            profile);
+    if (login_manager)
+      login_manager->AddObserver(this);
   }
 }
 
 base::FilePath ProfileHelper::GetActiveUserProfileDir() {
   DCHECK(!active_user_id_hash_.empty());
   return base::FilePath(chrome::kProfileDirPrefix + active_user_id_hash_);
 }
 
 void ProfileHelper::Initialize() {
-  UserManager::Get()->AddObserver(this);
   UserManager::Get()->AddSessionStateObserver(this);
 }
 
 void ProfileHelper::ClearSigninProfile(const base::Closure& on_clear_callback) {
   on_clear_callbacks_.push_back(on_clear_callback);
   if (signin_profile_clear_requested_)
     return;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // Check if signin profile was loaded.
   if (!profile_manager->GetProfileByPath(GetSigninProfileDir())) {
@@ skipping 14 matching lines @@
 void ProfileHelper::OnBrowsingDataRemoverDone() {
   signin_profile_clear_requested_ = false;
   for (size_t i = 0; i < on_clear_callbacks_.size(); ++i) {
     if (!on_clear_callbacks_[i].is_null())
       on_clear_callbacks_[i].Run();
   }
   on_clear_callbacks_.clear();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ProfileHelper, UserManager::Observer implementation:
+// ProfileHelper, OAuth2LoginManager::Observer implementation:
 
-void ProfileHelper::MergeSessionStateChanged(
-    UserManager::MergeSessionState state) {
-  if (state ==  UserManager:: MERGE_STATUS_DONE)
+void ProfileHelper::OnSessionRestoreStateChanged(
+    Profile* user_profile,
+    OAuth2LoginManager::SessionRestoreState state) {
+  if (state ==  OAuth2LoginManager::SESSION_RESTORE_DONE ||
+      state ==  OAuth2LoginManager::SESSION_RESTORE_FAILED) {
+    chromeos::OAuth2LoginManager* login_manager =
+        chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
+            user_profile);
+    login_manager->RemoveObserver(this);
     ClearSigninProfile(base::Closure());
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ProfileHelper, UserManager::UserSessionStateObserver implementation:
 
 void ProfileHelper::ActiveUserHashChanged(const std::string& hash) {
   active_user_id_hash_ = hash;
   base::FilePath profile_path = GetProfilePathByUserIdHash(hash);
   LOG(INFO) << "Switching to profile path: " << profile_path.value();
 }
 
 }  // namespace chromeos