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

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

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

index 2f75006bae180eb7efca4ca4e6345d178b00532a..286a85ed0ae81d7c0f2a0ee1095319816c39c3c9 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

@@ -13,7 +13,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"

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

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

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

#include "chrome/browser/prefs/browser_prefs.h"

#include "chrome/common/chrome_constants.h"

@@ -193,10 +193,9 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {

public:

EasyUnlockTpmKeyManagerTest()

: thread_bundle_(content::TestBrowserThreadBundle::REAL_IO_THREAD),

- user_manager_(new chromeos::FakeUserManager),

+ user_manager_(new chromeos::FakeChromeUserManager()),

user_manager_enabler_(user_manager_),

- profile_manager_(TestingBrowserProcess::GetGlobal()) {

- }

+ profile_manager_(TestingBrowserProcess::GetGlobal()) {}

~EasyUnlockTpmKeyManagerTest() override {}

void SetUp() override {

@@ -286,7 +285,7 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {

scoped_ptr<crypto::ScopedTestSystemNSSKeySlot> test_system_slot_;

// Needed to properly set up signin and user profiles for test.

- chromeos::FakeUserManager* user_manager_;

+ user_manager::FakeUserManager* user_manager_;

chromeos::ScopedUserManagerEnabler user_manager_enabler_;

TestingProfileManager profile_manager_;