chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_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/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

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

Patch Set: Rebase. 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/login/users/fake_chrome_user_manager.cc ('K') | « chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc ('k') | chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

index b8f2b564808ae254d5648ad824612df844b095c6..12ab229d973f2d10ab1b3207e6da318f224cd2d4 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

@@ -19,7 +19,7 @@

#include "base/prefs/pref_service.h"

#include "base/prefs/testing_pref_service.h"

#include "chrome/browser/chromeos/login/startup_utils.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/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

@@ -39,14 +39,13 @@ namespace chromeos {

class WallpaperManagerCacheTest : public test::AshTestBase {

public:

WallpaperManagerCacheTest()

- : fake_user_manager_(new FakeUserManager()),

- scoped_user_manager_(fake_user_manager_) {

- }

+ : fake_user_manager_(new FakeChromeUserManager()),

+ scoped_user_manager_(fake_user_manager_) {}

protected:

~WallpaperManagerCacheTest() override {}

- FakeUserManager* fake_user_manager() { return fake_user_manager_; }

+ FakeChromeUserManager* fake_user_manager() { return fake_user_manager_; }

void SetUp() override { test::AshTestBase::SetUp(); }

@@ -59,7 +58,7 @@ class WallpaperManagerCacheTest : public test::AshTestBase {

}

private:

- FakeUserManager* fake_user_manager_;

+ FakeChromeUserManager* fake_user_manager_;

ScopedUserManagerEnabler scoped_user_manager_;

};