chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types.

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 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 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/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_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_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 4ff24e6cfa629c0a9b6e0e57eff7815fb4320d9d..f071014a05779faae289a85b527adbc2968e5f21 100644

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

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

@@ -9,13 +9,11 @@

#include "ash/common/wm_shell.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/desktop_background/desktop_background_controller_observer.h"

-#include "ash/desktop_background/desktop_background_controller_test_api.h"

#include "ash/display/display_manager.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/ash_test_helper.h"

#include "ash/test/display_manager_test_api.h"

-#include "ash/test/test_user_wallpaper_delegate.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

@@ -43,7 +41,6 @@

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/image/image_skia.h"

-using wallpaper::WallpaperLayout;

using wallpaper::WallpaperInfo;

using wallpaper::WALLPAPER_LAYOUT_CENTER;

using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED;

@@ -76,9 +73,8 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

void SetUpOnMainThread() override {

controller_ = ash::Shell::GetInstance()->desktop_background_controller();

+ controller_->set_wallpaper_reload_delay_for_test(0);

local_state_ = g_browser_process->local_state();

- ash::DesktopBackgroundController::TestAPI(controller_)

- .set_wallpaper_reload_delay_for_test(0);

UpdateDisplay("800x600");

}