Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(975)

Unified Diff: chrome/browser/chromeos/policy/power_policy_browsertest.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Removed unused #includes Created 4 years, 2 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
Index: chrome/browser/chromeos/policy/power_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index 81bb0184abbbe980ed733d9f62a8332cd6285347..d5a080d1382dc887916908597d3d278020e276b1 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -41,7 +41,6 @@
#include "chromeos/dbus/fake_session_manager_client.h"
#include "chromeos/dbus/power_manager/policy.pb.h"
#include "chromeos/dbus/power_policy_controller.h"
-#include "chromeos/login/user_names.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "components/policy/core/common/cloud/policy_builder.h"
@@ -50,6 +49,7 @@
#include "components/policy/core/common/policy_service.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_names.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -199,7 +199,7 @@ void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
// Initialize user policy.
InstallUserKey();
user_policy_.policy_data().set_username(
- chromeos::login::StubAccountId().GetUserEmail());
+ user_manager::StubAccountId().GetUserEmail());
}
void PowerPolicyBrowserTestBase::InstallUserKey() {
@@ -207,7 +207,7 @@ void PowerPolicyBrowserTestBase::InstallUserKey() {
ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(
- cryptohome::Identification(chromeos::login::StubAccountId()));
+ cryptohome::Identification(user_manager::StubAccountId()));
base::FilePath user_key_file =
user_keys_dir.AppendASCII(sanitized_username)
.AppendASCII("policy.pub");

Powered by Google App Engine
This is Rietveld 408576698