chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/login/existing_user_controller_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/existing_user_controller_auto_login_unittest.cc ('k') | chrome/browser/chromeos/login/fake_login_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

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

index 247b27e16cd251bceb9ba5531c2c5f72bd54112d..0464c0d15afeac71431db876eb4fcc041c36d617 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -19,7 +19,7 @@

#include "chrome/browser/chromeos/login/ui/mock_login_display.h"

#include "chrome/browser/chromeos/login/ui/mock_login_display_host.h"

#include "chrome/browser/chromeos/login/users/mock_user_manager.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

+#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/device_local_account.h"

@@ -43,6 +43,7 @@

#include "components/policy/core/common/cloud/mock_cloud_policy_store.h"

#include "components/policy/core/common/cloud/policy_builder.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

#include "content/public/test/mock_notification_observer.h"

#include "content/public/test/test_utils.h"

@@ -350,11 +351,12 @@ class ExistingUserControllerPublicSessionTest

ExistingUserControllerTest::SetUpOnMainThread();

// Wait for the public session user to be created.

- if (!chromeos::UserManager::Get()->IsKnownUser(public_session_user_id_)) {

+ if (!user_manager::UserManager::Get()->IsKnownUser(

+ public_session_user_id_)) {

content::WindowedNotificationObserver(

chrome::NOTIFICATION_USER_LIST_CHANGED,

- base::Bind(&chromeos::UserManager::IsKnownUser,

- base::Unretained(chromeos::UserManager::Get()),

+ base::Bind(&user_manager::UserManager::IsKnownUser,

+ base::Unretained(user_manager::UserManager::Get()),

public_session_user_id_)).Wait();

}