chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

Unified Diff: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.cc ('k') | chrome/browser/chromeos/login/managed/managed_user_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

diff --git a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

index 238debff03de74ab8d1d7f1c5c3b34a4dda67e6e..161c9914de2ea50d2885712d35d8e2acec2e5e97 100644

--- a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

+++ b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

@@ -18,13 +18,13 @@

#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"

@@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

"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();

}

@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

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_);

@@ -203,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

"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();

}

@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

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_);