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

chrome/browser/chromeos/login/managed/managed_user_test_base.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/managed/managed_user_test_base.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/auth/key.h"
 #include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_registration_utility.h"
-#include "chrome/browser/managed_mode/managed_user_registration_utility_stub.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
 #include "chrome/browser/profiles/profile_impl.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
+#include "chrome/browser/supervised_user/supervised_user_registration_utility_stub.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
 #include "chromeos/cryptohome/mock_async_method_caller.h"
 #include "chromeos/cryptohome/mock_homedir_methods.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "sync/api/attachments/attachment_service_proxy_for_test.h"
 #include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/protocol/sync.pb.h"
 
 using testing::_;
 using base::StringPrintf;
 
 namespace chromeos {
 
 namespace {
 
 const char kCurrentPage[] = "$('managed-user-creation').currentPage_";
 }
 
 ManagedUsersSyncTestAdapter::ManagedUsersSyncTestAdapter(Profile* profile)
     : processor_(), next_sync_data_id_(0) {
-  service_ = ManagedUserSyncServiceFactory::GetForProfile(profile);
+  service_ = SupervisedUserSyncServiceFactory::GetForProfile(profile);
   processor_ = new syncer::FakeSyncChangeProcessor();
   service_->MergeDataAndStartSyncing(
       syncer::SUPERVISED_USERS,
       syncer::SyncDataList(),
       scoped_ptr<syncer::SyncChangeProcessor>(processor_),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
 }
 
 scoped_ptr< ::sync_pb::ManagedUserSpecifics>
 ManagedUsersSyncTestAdapter::GetFirstChange() {
@@ skipping 28 matching lines @@
   syncer::SyncChangeList change_list;
   change_list.push_back(change);
 
   service_->ProcessSyncChanges(FROM_HERE, change_list);
 }
 
 ManagedUsersSharedSettingsSyncTestAdapter::
     ManagedUsersSharedSettingsSyncTestAdapter(Profile* profile)
     : processor_(), next_sync_data_id_(0) {
   service_ =
-      ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
+      SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
   processor_ = new syncer::FakeSyncChangeProcessor();
   service_->MergeDataAndStartSyncing(
       syncer::SUPERVISED_USER_SHARED_SETTINGS,
       syncer::SyncDataList(),
       scoped_ptr<syncer::SyncChangeProcessor>(processor_),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
 }
 
 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics>
 ManagedUsersSharedSettingsSyncTestAdapter::GetFirstChange() {
@@ skipping 31 matching lines @@
   service_->ProcessSyncChanges(FROM_HERE, change_list);
 }
 
 void ManagedUsersSharedSettingsSyncTestAdapter::AddChange(
     const std::string& mu_id,
     const std::string& key,
     const base::Value& value,
     bool acknowledged,
     bool update) {
   syncer::SyncData data =
-      ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+      SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
           mu_id, key, value, acknowledged);
   AddChange(data.GetSpecifics().managed_user_shared_setting(), update);
 }
 
 ManagedUserTestBase::ManagedUserTestBase()
     : LoginManagerTest(true),
       mock_async_method_caller_(NULL),
       mock_homedir_methods_(NULL),
       network_portal_detector_(NULL),
       registration_utility_stub_(NULL) {
 }
 
 ManagedUserTestBase::~ManagedUserTestBase() {
 }
 
 void ManagedUserTestBase::SetUpInProcessBrowserTestFixture() {
   LoginManagerTest::SetUpInProcessBrowserTestFixture();
   mock_async_method_caller_ = new cryptohome::MockAsyncMethodCaller;
   mock_async_method_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
   cryptohome::AsyncMethodCaller::InitializeForTesting(
       mock_async_method_caller_);
 
   mock_homedir_methods_ = new cryptohome::MockHomedirMethods;
   mock_homedir_methods_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
   cryptohome::HomedirMethods::InitializeForTesting(mock_homedir_methods_);
 
-  registration_utility_stub_ = new ManagedUserRegistrationUtilityStub();
-  scoped_utility_.reset(new ScopedTestingManagedUserRegistrationUtility(
+  registration_utility_stub_ = new SupervisedUserRegistrationUtilityStub();
+  scoped_utility_.reset(new ScopedTestingSupervisedUserRegistrationUtility(
       registration_utility_stub_));
 
   // Setup network portal detector to return online state for both
   // ethernet and wifi networks. Ethernet is an active network by
   // default.
   network_portal_detector_ = new NetworkPortalDetectorTestImpl();
   NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
   NetworkPortalDetector::CaptivePortalState online_state;
   online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
@@ skipping 228 matching lines @@
   // Confirm deletion.
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
       user_index));
 
   // Make sure there is no supervised user in list.
   ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos