chrome/browser/extensions/extension_garbage_collector_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/extension_garbage_collector_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

« no previous file with comments | « chrome/browser/extensions/crx_installer_browsertest.cc ('k') | chrome/browser/extensions/external_provider_impl_chromeos_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 617249817c975a42f42900d7f780b52508358eb6..622f324a17ca67550a7576c4f1d636f5e510e5ad 100644

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

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

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

#include "base/strings/string_util.h"

#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/fake_chrome_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"

@@ -66,9 +66,10 @@ class ExtensionGarbageCollectorChromeOSUnitTest

ExtensionAssetsManagerChromeOS::SetSharedInstallDirForTesting(cache_dir());

ExtensionGarbageCollectorChromeOS::ClearGarbageCollectedForTesting();

- // Initialize the UserManager singleton to a fresh FakeUserManager instance.

- user_manager_enabler_.reset(

- new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));

+ // Initialize the UserManager singleton to a fresh FakeChromeUserManager

+ // instance.

+ user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(

+ new chromeos::FakeChromeUserManager));

GetFakeUserManager()->AddUser(chromeos::login::kStubUser);

GetFakeUserManager()->LoginUser(chromeos::login::kStubUser);

@@ -144,8 +145,8 @@ class ExtensionGarbageCollectorChromeOSUnitTest

return ExtensionPrefs::Get(profile_.get());

}

- chromeos::FakeUserManager* GetFakeUserManager() {

- return static_cast<chromeos::FakeUserManager*>(

+ chromeos::FakeChromeUserManager* GetFakeUserManager() {

+ return static_cast<chromeos::FakeChromeUserManager*>(

user_manager::UserManager::Get());

}