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

chrome/browser/chromeos/login/managed/managed_user_password_browsertest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.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/login_manager_test.h"
 #include "chrome/browser/chromeos/login/managed/managed_user_test_base.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/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"
@@ skipping 47 matching lines @@
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
 
   shared_settings_adapter_->AddChange(
-      sync_id, managed_users::kChromeOSPasswordData, password, true, false);
+      sync_id, supervised_users::kChromeOSPasswordData, password, true, false);
   content::RunAllPendingInMessageLoop();
 }
 
 // Supervised user signs in for second time, and actual password migration takes
 // place.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PasswordChangeFromUserTest) {
   EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
   EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1);
   SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName);
@@ skipping 41 matching lines @@
 
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
   shared_settings_adapter_->AddChange(
-      sync_id, managed_users::kChromeOSPasswordData, password, true, false);
+      sync_id, supervised_users::kChromeOSPasswordData, password, true, false);
   content::RunAllPendingInMessageLoop();
 
   testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
 }
 
 // After that supervised user signs in, and no password change happens.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PasswordChangeFromManagerTest) {
   EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
   EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
@@ skipping 28 matching lines @@
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
 
   shared_settings_adapter_->AddChange(
-      sync_id, managed_users::kChromeOSPasswordData, password, true, false);
+      sync_id, supervised_users::kChromeOSPasswordData, password, true, false);
   content::RunAllPendingInMessageLoop();
 }
 
 // After that manager signs in, and also detects password change. Manager
 // performs the migration.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PRE_PasswordChangeUserAndManagerTest) {
   const User* managed_user = UserManager::Get()->GetUsers().at(0);
 
   SigninAsManager(1);
@@ skipping 18 matching lines @@
 
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
   shared_settings_adapter_->AddChange(
-      sync_id, managed_users::kChromeOSPasswordData, password, true, false);
+      sync_id, supervised_users::kChromeOSPasswordData, password, true, false);
   content::RunAllPendingInMessageLoop();
 
   testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
 }
 
 // When supervised user signs in, password is already migrated, so no migration
 // should be attempted.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PasswordChangeUserAndManagerTest) {
   EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
   EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
   SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
   testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
 }
 
 }  // namespace chromeos