chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 2355063002: Separate ash::test::DisplayManagerTestApi from ash

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_browsertest.cc

Issue 2355063002: Separate ash::test::DisplayManagerTestApi from ash (Closed)

Patch Set: rebased, cleanup Created 4 years, 3 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/display/display_preferences_unittest.cc ('K') | « chrome/browser/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc » ('j') | chrome/browser/extensions/display_info_provider_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ab884c51cb1ac4f38ed4be1d036bc2c8cc6eac1a..c635ae69f1d7607d9a97481183f2f4dc8a4baa1c 100644

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

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

@@ -87,7 +87,9 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

// Update the display configuration as given in |display_specs|. See

// ash::test::DisplayManagerTestApi::UpdateDisplay for more details.

void UpdateDisplay(const std::string& display_specs) {

- ash::test::DisplayManagerTestApi().UpdateDisplay(display_specs);

+ ash::test::DisplayManagerTestApi(

+ ash::Shell::GetInstance()->display_manager())

+ .UpdateDisplay(display_specs);

}

void WaitAsyncWallpaperLoadStarted() {