New user type introduced. Combines regular and supervised features.

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

Index: chrome/browser/chromeos/login/signin/merge_session_throttle.cc
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
index b8f8b020863c356a4d35429409f60672ad37845b..b4ce9d65bc5fac368d4d9dbd91ba7adcd4ee9de0 100644
--- a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
@@ -164,7 +164,8 @@ bool MergeSessionThrottle::ShouldDelayRequest(
 
   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())
@@ -205,7 +206,7 @@ bool MergeSessionThrottle::ShouldDelayRequest(
       // 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?";