Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

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: 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
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..edf428d23a2fb0e53eec92fd129bf5060e3fd843 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,9 +33,8 @@ const char kExternalAppId[] = "kekdneafjmhmndejhmbcadfiiofngffo";
class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {
public:
ExternalProviderImplChromeOSTest()
- : fake_user_manager_(new chromeos::FakeUserManager()),
- scoped_user_manager_(fake_user_manager_) {
- }
+ : fake_user_manager_(new user_manager::FakeUserManager()),
+ scoped_user_manager_(fake_user_manager_) {}
~ExternalProviderImplChromeOSTest() override {}
@@ -75,7 +74,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);

Powered by Google App Engine
This is Rietveld 408576698