chrome/browser/extensions/external_provider_impl_chromeos_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/extensions/external_provider_impl_chromeos_unittest.cc

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

Patch Set: Split for FakeManager complete. Created 5 years, 11 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/policy/cloud_external_data_policy_observer_unittest.cc ('K') | « chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc ('k') | chrome/browser/extensions/external_provider_impl_unittest.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

index 5793068df98f95c143eead9297f6f5d33d61e3a0..9aae589e2dd91a80280306e93461a713ac711256 100644

--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

@@ -11,7 +11,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

#include "chrome/browser/chromeos/customization/customization_document.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/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_service_test_base.h"

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

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

#include "chromeos/system/fake_statistics_provider.h"

#include "chromeos/system/statistics_provider.h"

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

#include "content/public/browser/notification_service.h"

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

@@ -33,7 +33,7 @@ const char kExternalAppId[] = "kekdneafjmhmndejhmbcadfiiofngffo";

class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {

public:

ExternalProviderImplChromeOSTest()

- : fake_user_manager_(new chromeos::FakeUserManager()),

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

scoped_user_manager_(fake_user_manager_) {

}

@@ -75,7 +75,7 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {

TestingPrefServiceSimple local_state_;

scoped_ptr<base::ScopedPathOverride> external_externsions_overrides_;

chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;

- chromeos::FakeUserManager* fake_user_manager_;

+ user_manager::FakeUserManager* fake_user_manager_;

chromeos::ScopedUserManagerEnabler scoped_user_manager_;

DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplChromeOSTest);