chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc - Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager

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 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)

Patch Set: Addressed comment Created 4 years, 1 month 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/events/event_rewriter_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 6a8a251b2e1752f6c5b64bc85c5b27143015224d..72d67d4e46793c101d7875b53dea105f189c57bf 100644

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

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

@@ -20,6 +20,7 @@

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.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/chromeos/ownership/owner_settings_service_chromeos.h"

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

@@ -47,7 +48,6 @@

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

#include "crypto/nss_util_internal.h"

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

public:

CryptohomeAuthenticatorTest()

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

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

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

user_manager_enabler_(user_manager_),

mock_caller_(NULL),

mock_homedir_methods_(NULL),

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

TestingProfile profile_;

std::unique_ptr<TestingProfileManager> profile_manager_;

- user_manager::FakeUserManager* user_manager_;

+ chromeos::FakeChromeUserManager* user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

cryptohome::MockAsyncMethodCaller* mock_caller_;