chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.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/auth/parallel_authenticator_unittest.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/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/crash_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc

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

index d542e315ab72362a4557e63ddf076abb9bce5b8a..3c5f9e8fb1cf16ea75bb5c49709d697aa671b861 100644

--- a/chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc

+++ b/chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc

@@ -16,7 +16,6 @@

#include "chrome/browser/chromeos/login/auth/mock_url_fetchers.h"

#include "chrome/browser/chromeos/login/auth/test_attempt_state.h"

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

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

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

#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

@@ -36,6 +35,7 @@

#include "chromeos/login/auth/key.h"

#include "chromeos/login/auth/mock_auth_status_consumer.h"

#include "chromeos/login/auth/user_context.h"

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

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

#include "crypto/nss_util.h"

#include "crypto/nss_util_internal.h"

@@ -124,7 +124,8 @@ class ParallelAuthenticatorTest : public testing::Test {

owner_key_util_(new MockOwnerKeyUtil) {

user_context_.SetKey(Key("fakepass"));

user_context_.SetUserIDHash("me_nowhere_com_hash");

- const User* user = user_manager_->AddUser(user_context_.GetUserID());

+ const user_manager::User* user =

+ user_manager_->AddUser(user_context_.GetUserID());

profile_.set_profile_name(user_context_.GetUserID());

ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, &profile_);