chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/chromeos/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/users/multi_profile_user_controller.cc ('k') | chrome/browser/chromeos/login/users/remove_user_delegate.h » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
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 5f3258f7f72607924e0161008bbfc5fd572fb00e..d93fb24fecb7f2608c4bdc45ca3a88e67562360e 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

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

#include "base/strings/utf_string_conversions.h"

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

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

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

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

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

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

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

@@ -21,6 +21,7 @@

#include "chrome/test/base/testing_pref_service_syncable.h"

#include "chrome/test/base/testing_profile.h"

#include "chrome/test/base/testing_profile_manager.h"

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

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

#include "net/cert/x509_certificate.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -91,8 +92,9 @@ policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = NULL;

KeyedService* TestPolicyCertServiceFactory(content::BrowserContext* context) {

return policy::PolicyCertService::CreateForTesting(

- kUsers[0], g_policy_cert_verifier_for_factory, UserManager::Get())

- .release();

+ kUsers[0],

+ g_policy_cert_verifier_for_factory,

+ user_manager::UserManager::Get()).release();

}

} // namespace