chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 398753004: [cros] Move User class to user_manager component.

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 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.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 5c6b26d0095caa13a82a9b08bbdeb95557ed9604..4772ee769792697d03e980dbe3520f10567f6006 100644

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

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

@@ -21,7 +21,6 @@

#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.h"

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

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

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

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

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

#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 "content/public/test/mock_notification_observer.h"

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

#include "google_apis/gaia/mock_url_fetcher_factory.h"

@@ -168,7 +168,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {

existing_user_controller_.reset(

new ExistingUserController(mock_login_display_host_.get()));

ASSERT_EQ(existing_user_controller(), existing_user_controller_.get());

- existing_user_controller_->Init(UserList());

+ existing_user_controller_->Init(user_manager::UserList());

profile_prepared_cb_ =

base::Bind(&ExistingUserController::OnProfilePrepared,

base::Unretained(existing_user_controller()),

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/fake_login_utils.cc » ('j') | no next file with comments »