chrome/browser/extensions/extension_garbage_collector_chromeos_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/extensions/extension_garbage_collector_chromeos_unittest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/extensions/extension_garbage_collector_chromeos.cc ('k') | chrome/browser/extensions/extension_gcm_app_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

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

index fea341ebb0ac66800db9a585913ef31c6037cabd..ea6451ead58af116dc48a7a2937da87d2a993a98 100644

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

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

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

#include "base/threading/sequenced_worker_pool.h"

#include "base/values.h"

#include "chrome/browser/chromeos/login/users/fake_user_manager.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/profiles/profile_helper.h"

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

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

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

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

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

#include "chromeos/login/user_names.h"

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

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

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

#include "extensions/browser/extension_prefs.h"

@@ -140,7 +141,7 @@ class ExtensionGarbageCollectorChromeOSUnitTest

chromeos::FakeUserManager* GetFakeUserManager() {

return static_cast<chromeos::FakeUserManager*>(

- chromeos::UserManager::Get());

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

}

private: