Avoid the long merge session throttle interstitial page for NTP on Chrome OS

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

 // Copyright 2015 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/signin/merge_session_throttling_utils.h"
 
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 80 matching lines @@
   DVLOG(1) << "Unblocking profile " << profile;
   ProfileSet::Get()->erase(profile);
 
   // Check if there is any other profile to block on.
   if (ProfileSet::Get()->size() == 0) {
     base::AtomicRefCountInc(&g_all_profiles_restored_);
     DVLOG(1) << "All profiles merged " << g_all_profiles_restored_;
   }
 }
 
-bool ShouldDelayRequest(content::WebContents* web_contents) {
+bool ShouldDelayRequest(Profile* profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
     return false;
   } else if (!user_manager::UserManager::Get()
                   ->IsLoggedInAsUserWithGaiaAccount()) {
     // This is not a regular user session, let's remove the throttle
     // permanently.
     if (!AreAllSessionMergedAlready())
       base::AtomicRefCountInc(&g_all_profiles_restored_);
 
     return false;
   }
 
-  content::BrowserContext* browser_context = web_contents->GetBrowserContext();
-  if (!browser_context)
-    return false;
-
-  Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return false;
 
   chromeos::OAuth2LoginManager* login_manager =
       chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
           profile);
   if (!login_manager)
     return false;
 
   switch (login_manager->state()) {
@@ skipping 29 matching lines @@
     case chromeos::OAuth2LoginManager::SESSION_RESTORE_CONNECTION_FAILED: {
       UnblockProfile(profile);
       return false;
     }
   }
 
   NOTREACHED();
   return false;
 }
 
+bool ShouldDelayRequest(content::WebContents* web_contents) {
+  content::BrowserContext* browser_context = web_contents->GetBrowserContext();
+  if (!browser_context)
+    return false;
+
+  return ShouldDelayRequest(Profile::FromBrowserContext(browser_context));
+}
+
 bool ShouldDelayUrl(const GURL& url) {
   // If we are loading google properties while merge session is in progress,
   // we will show delayed loading page instead.
   return !net::NetworkChangeNotifier::IsOffline() &&
          !AreAllSessionMergedAlready() &&
          google_util::IsGoogleHostname(url.host_piece(),
                                        google_util::ALLOW_SUBDOMAIN);
 }
 
 }  // namespace merge_session_throttling_utils