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

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

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in one more test Created 6 years, 5 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 e8a21d6a206d1865094a6f76eb5cb28d03e660f0..4cb2e5750721826dbc41c3ed26de8dedc8536807 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -17,7 +17,6 @@
#include "base/path_service.h"
#include "base/run_loop.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
@@ -39,6 +38,7 @@
#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"
@@ -193,7 +193,7 @@ void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
// Initialize user policy.
InstallUserKey();
- user_policy_.policy_data().set_username(chromeos::UserManager::kStubUser);
+ user_policy_.policy_data().set_username(chromeos::login::kStubUser);
}
void PowerPolicyBrowserTestBase::InstallUserKey() {
@@ -201,7 +201,7 @@ void PowerPolicyBrowserTestBase::InstallUserKey() {
ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(
- chromeos::UserManager::kStubUser);
+ chromeos::login::kStubUser);
base::FilePath user_key_file =
user_keys_dir.AppendASCII(sanitized_username)
.AppendASCII("policy.pub");

Powered by Google App Engine
This is Rietveld 408576698