Added check for profile loading completion.

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"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/network_change_notifier.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::WebContents;
@@ skipping 71 matching lines @@
   // 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 ShouldDelayRequestForProfile(Profile* profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
+  if (!chromeos::ProfileHelper::Get()->GetUserByProfile(profile))
+    return false;
+
+  if (!chromeos::ProfileHelper::Get()->GetUserByProfile(profile)->
+          is_profile_created()) {
+    return false;
+  }
+
   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;
@@ skipping 60 matching lines @@
 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