Rename "managed (mode|user)" to "supervised user" (part 7)

chrome/browser/chromeos/login/auth/login_performer.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/auth/login_performer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
-#include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
-#include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
-#include "chrome/browser/chromeos/login/managed/supervised_user_login_flow.h"
+#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
+#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
+#include "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/user_names.h"
@@ skipping 160 matching lines @@
         break;
     }
   } else {
     if (delegate_)
       delegate_->WhiteListCheckFailed(user_context.GetUserID());
     else
       NOTREACHED();
   }
 }
 
-void LoginPerformer::LoginAsLocallyManagedUser(
+void LoginPerformer::LoginAsSupervisedUser(
     const UserContext& user_context) {
-  DCHECK_EQ(chromeos::login::kLocallyManagedUserDomain,
+  DCHECK_EQ(chromeos::login::kSupervisedUserDomain,
             gaia::ExtractDomainName(user_context.GetUserID()));
 
   CrosSettings* cros_settings = CrosSettings::Get();
   CrosSettingsProvider::TrustedStatus status =
         cros_settings->PrepareTrustedValues(
-            base::Bind(&LoginPerformer::LoginAsLocallyManagedUser,
+            base::Bind(&LoginPerformer::LoginAsSupervisedUser,
                        weak_factory_.GetWeakPtr(),
                        user_context_));
   // Must not proceed without signature verification.
   if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
     if (delegate_)
       delegate_->PolicyLoadFailed();
     else
       NOTREACHED();
     return;
   } else if (status != CrosSettingsProvider::TRUSTED) {
     // Value of kAccountsPrefSupervisedUsersEnabled setting is still not
     // verified. Another attempt will be invoked after verification completion.
     return;
   }
 
-  if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) {
-    LOG(ERROR) << "Login attempt of locally managed user detected.";
+  if (!UserManager::Get()->AreSupervisedUsersAllowed()) {
+    LOG(ERROR) << "Login attempt of supervised user detected.";
     delegate_->WhiteListCheckFailed(user_context.GetUserID());
     return;
   }
 
   SupervisedUserLoginFlow* new_flow =
       new SupervisedUserLoginFlow(user_context.GetUserID());
   new_flow->set_host(
       UserManager::Get()->GetUserFlow(user_context.GetUserID())->host());
   UserManager::Get()->SetUserFlow(user_context.GetUserID(), new_flow);
 
@@ skipping 16 matching lines @@
         base::Bind(&ExtendedAuthenticator::AuthenticateToMount,
                    extended_authenticator_.get(),
                    user_context_copy,
                    ExtendedAuthenticator::ResultCallback()));
 
   } else {
     authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
-        base::Bind(&Authenticator::LoginAsLocallyManagedUser,
+        base::Bind(&Authenticator::LoginAsSupervisedUser,
                    authenticator_.get(),
                    user_context_copy));
   }
 }
 
 void LoginPerformer::LoginRetailMode() {
   authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Authenticator::LoginRetailMode, authenticator_.get()));
@@ skipping 89 matching lines @@
     policy::WildcardLoginChecker::Result result) {
   if (result == policy::WildcardLoginChecker::RESULT_ALLOWED) {
     StartLoginCompletion();
   } else {
     if (delegate_)
       delegate_->WhiteListCheckFailed(user_context_.GetUserID());
   }
 }
 
 }  // namespace chromeos