chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc - Issue 824683002: UserManager stack refactoring.

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/cryptohome_authenticator_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fixed. Created 5 years, 10 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/input_method/input_method_persistence_unittest.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 62d9ccc136de99c35ca5d9e3a6708eda0cbb4398..c3dcd6efa41dae8ac656587166be77daf17e635f 100644

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

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

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

#include "base/run_loop.h"

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

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

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

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

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

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

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

#include "chromeos/login/login_state.h"

#include "components/ownership/mock_owner_key_util.h"

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

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

#include "crypto/nss_util_internal.h"

#include "crypto/scoped_test_nss_chromeos_user.h"

@@ -131,7 +131,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {

public:

CryptohomeAuthenticatorTest()

: user_context_("me@nowhere.org"),

- user_manager_(new FakeUserManager()),

+ user_manager_(new user_manager::FakeUserManager()),

user_manager_enabler_(user_manager_),

mock_caller_(NULL),

mock_homedir_methods_(NULL),

@@ -325,7 +325,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {

TestingProfile profile_;

scoped_ptr<TestingProfileManager> profile_manager_;

- FakeUserManager* user_manager_;

+ user_manager::FakeUserManager* user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

cryptohome::MockAsyncMethodCaller* mock_caller_;