chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc - Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Update after review. 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

« no previous file with comments | « no previous file | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..f36fc4aa22b90143e38d7aa67b10fc59c5225c97 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::kSupervisedUserDomain.

const char kTestSupervisedUserName[] = "test@locally-managed.localhost";

class MockAccessibilityObserver {

@@ -646,7 +646,7 @@ INSTANTIATE_TEST_CASE_P(

UserTypeInstantiation,

AccessibilityManagerUserTypeTest,

::testing::Values(kTestUserName,

- login::GuestAccountId().GetUserEmail().c_str(),

+ user_manager::GuestAccountId().GetUserEmail().c_str(),

kTestSupervisedUserName));

IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,