OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/merge_session_load_page.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/login/merge_session_load_page.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 23 matching lines @@
 
 namespace chromeos {
 
 MergeSessionLoadPage::MergeSessionLoadPage(WebContents* web_contents,
                                            const GURL& url,
                                            const CompletionCallback& callback)
     : callback_(callback),
       proceeded_(false),
       web_contents_(web_contents),
       url_(url) {
-  UserManager::Get()->AddObserver(this);
+  OAuth2LoginManager* manager = GetOAuth2LoginManager();
+  manager->AddObserver(this);
   interstitial_page_ = InterstitialPage::Create(web_contents, true, url, this);
 }
 
 MergeSessionLoadPage::~MergeSessionLoadPage() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  UserManager::Get()->RemoveObserver(this);
+  OAuth2LoginManager* manager = GetOAuth2LoginManager();
+  manager->RemoveObserver(this);
 }
 
 void MergeSessionLoadPage::Show() {
   interstitial_page_->Show();
 }
 
 std::string MergeSessionLoadPage::GetHTMLContents() {
   DictionaryValue strings;
   strings.SetString("title", web_contents_->GetTitle());
   // Set the timeout to show the page.
@@ skipping 47 matching lines @@
   }
 }
 
 void MergeSessionLoadPage::NotifyBlockingPageComplete() {
   if (!callback_.is_null()) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, callback_);
   }
 }
 
-void MergeSessionLoadPage::MergeSessionStateChanged(
-    UserManager::MergeSessionState state) {
+OAuth2LoginManager* MergeSessionLoadPage::GetOAuth2LoginManager() {
+  content::BrowserContext* browser_context = web_contents_->GetBrowserContext();
+  if (!browser_context)
+    return NULL;
+
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  if (!profile)
+    return NULL;
+
+  return OAuth2LoginManagerFactory::GetInstance()->GetForProfile(profile);
+}
+
+void MergeSessionLoadPage::OnSessionRestoreStateChanged(
+    Profile* user_profile, OAuth2LoginManager::SessionRestoreState state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DVLOG(1) << "Merge session is "
-           << (state !=  UserManager:: MERGE_STATUS_IN_PROCESS ?
+
+  OAuth2LoginManager* manager = GetOAuth2LoginManager();
+  DVLOG(1) << "Merge session should "
+           << (!manager->ShouldBlockTabLoading() ?
                   " NOT " : "")
-           << " in progress, "
+           << " be blocking now, "
            << state;
-  if (state !=  UserManager:: MERGE_STATUS_IN_PROCESS) {
-    UserManager::Get()->RemoveObserver(this);
+  if (!manager->ShouldBlockTabLoading()) {
+    manager->RemoveObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 }  // namespace chromeos