chrome/browser/chromeos/login/users/multi_profile_user_controller_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/users/multi_profile_user_controller_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/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/login/users/user_manager_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc

diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc

index bd822ace74ccf8c3ca604dfbeb28a900c42af9f0..126d6f11c30ce10983e0ecaa437fdf41475099e4 100644

--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc

+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc

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

#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

#include "base/strings/utf_string_conversions.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/multi_profile_user_controller_delegate.h"

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

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

@@ -114,7 +114,7 @@ class MultiProfileUserControllerTest

public MultiProfileUserControllerDelegate {

public:

MultiProfileUserControllerTest()

- : fake_user_manager_(new FakeUserManager),

+ : fake_user_manager_(new FakeChromeUserManager),

user_manager_enabler_(fake_user_manager_),

user_not_allowed_count_(0) {}

~MultiProfileUserControllerTest() override {}

@@ -203,7 +203,7 @@ class MultiProfileUserControllerTest

content::TestBrowserThreadBundle threads_;

scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;

scoped_ptr<TestingProfileManager> profile_manager_;

- FakeUserManager* fake_user_manager_; // Not owned

+ FakeChromeUserManager* fake_user_manager_; // Not owned

ScopedUserManagerEnabler user_manager_enabler_;

scoped_ptr<MultiProfileUserController> controller_;