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

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: 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/accessibility/accessibility_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
index 61dada2fd007018fc43295d7c887cd299eb6080a..3c066fc8962991cd407bb9eb6f9544f521c4e3c1 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -25,11 +25,11 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/chromeos_switches.h"
-#include "chromeos/login/user_names.h"
#include "components/prefs/pref_service.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/syncable_prefs/pref_service_syncable.h"
#include "components/user_manager/user_manager.h"
+#include "components/user_manager/user_names.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -54,7 +54,7 @@ const char kTestUserName[] = "owner@invalid.domain";
const int kTestAutoclickDelayMs = 2000;
// Test user name for supervised user. The domain part must be matched with
-// chromeos::login::kSupervisedUserDomain.
+// user_manager::chromeos::kSupervisedUserDomain.
const char kTestSupervisedUserName[] = "test@locally-managed.localhost";
class MockAccessibilityObserver {
@@ -645,9 +645,10 @@ class AccessibilityManagerUserTypeTest
INSTANTIATE_TEST_CASE_P(
UserTypeInstantiation,
AccessibilityManagerUserTypeTest,
- ::testing::Values(kTestUserName,
- login::GuestAccountId().GetUserEmail().c_str(),
- kTestSupervisedUserName));
+ ::testing::Values(
+ kTestUserName,
+ user_manager::chromeos::GuestAccountId().GetUserEmail().c_str(),
+ kTestSupervisedUserName));
IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,
EnableOnLoginScreenAndLogin) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | components/user_manager/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698