| 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 472e3b0ebdd7bd7020639a844c122527f8c2c542..11bf9fd71e75ea1cb8db4f74d1dee9d42d198d9d 100644
|
| --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
|
| @@ -627,7 +627,12 @@ class TestObserver : public WallpaperManager::Observer {
|
| DISALLOW_COPY_AND_ASSIGN(TestObserver);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, DisplayChange) {
|
| +#if defined(OS_CHROMEOS) && defined(USE_OZONE)
|
| +#define MAYBE_DisplayChange DISABLED_DisplayChange
|
| +#else
|
| +#define MAYBE_DisplayChange DisplayChange
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, MAYBE_DisplayChange) {
|
| TestObserver observer(WallpaperManager::Get());
|
|
|
| // Set the wallpaper to ensure that UpdateWallpaper() will be called when the
|
|
|