New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/signin/auth_sync_observer.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/auth_sync_observer.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ skipping 26 matching lines @@
 }
 
 void AuthSyncObserver::Shutdown() {
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (sync_service)
     sync_service->RemoveObserver(this);
 }
 
 void AuthSyncObserver::OnStateChanged() {
-  DCHECK(user_manager::UserManager::Get()->IsLoggedInAsRegularUser() ||
+  DCHECK(user_manager::UserManager::Get()->IsLoggedInAsUserWithGaiaAccount() ||
          user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser());
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile_);
   GoogleServiceAuthError::State state =
       sync_service->GetAuthError().state();
   if (state != GoogleServiceAuthError::NONE &&
       state != GoogleServiceAuthError::CONNECTION_FAILED &&
       state != GoogleServiceAuthError::SERVICE_UNAVAILABLE &&
       state != GoogleServiceAuthError::REQUEST_CANCELED) {
@@ skipping 34 matching lines @@
     }
   }
 }
 
 void AuthSyncObserver::OnSupervisedTokenLoaded(const std::string& token) {
   ChromeUserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
       profile_, token);
 }
 
 }  // namespace chromeos