New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/signin/merge_session_throttle.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/signin/merge_session_throttle.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ skipping 146 matching lines @@
 }
 
 // static
 bool MergeSessionThrottle::ShouldDelayRequest(
     int render_process_id,
     int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
     return false;
-  } else if (!user_manager::UserManager::Get()->IsLoggedInAsRegularUser()) {
+  } else if (!user_manager::UserManager::Get()->
+      IsLoggedInAsUserWithGaiaAccount()) {
     // This is not a regular user session, let's remove the throttle

[bartfab (slow), 2014/11/27 12:51:50]

Nit: s/regular/gaia/

     // permanently.
     if (!AreAllSessionMergedAlready())
       base::AtomicRefCountInc(&all_profiles_restored_);
 
     return false;
   }
 
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
   if (!render_view_host)
@@ skipping 19 matching lines @@
   if (!login_manager)
     return false;
 
   switch (login_manager->state()) {
     case chromeos::OAuth2LoginManager::SESSION_RESTORE_NOT_STARTED:
       // The session restore for this profile hasn't even started yet. Don't
       // block for now.
       // In theory this should not happen since we should
       // kick off the session restore process for the newly added profile
       // before we attempt loading any page.
-      if (user_manager::UserManager::Get()->IsLoggedInAsRegularUser() &&
+      if (user_manager::UserManager::Get()->IsLoggedInAsUserWithGaiaAccount() &&
           !user_manager::UserManager::Get()->IsLoggedInAsStub()) {
         LOG(WARNING) << "Loading content for a profile without "
                      << "session restore?";
       }
       return false;
     case chromeos::OAuth2LoginManager::SESSION_RESTORE_PREPARING:
     case chromeos::OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS: {
       // Check if the session restore has been going on for a while already.
       // If so, don't attempt to block page loading.
       if ((base::Time::Now() -
@@ skipping 46 matching lines @@
       Profile* profile = Profile::FromBrowserContext(
           web_contents->GetBrowserContext());
       (new chromeos::MergeSessionXHRRequestWaiter(profile,
                                                   callback))->StartWaiting();
     }
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, callback);
   }
 }