Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(818)

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

Issue 12220125: Revert the disabling of tests that I did while trying to switch to metacity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | chrome/browser/ui/panels/panel_drag_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index 95aaf9a9bcec69f19e87e6b4de4cd9247fd98680..2e5a9a27a512e20fa8c5ded73e956a204ae12f20 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -137,10 +137,8 @@ class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
// The large resolution wallpaper should be loaded when a large external screen
// is hooked up. If the external screen is smaller than small wallpaper
// resolution, do not load large resolution wallpaper.
-//
-// Temporarily disabled due to metacity switch: http://crbug.com/167114
IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
- DISABLED_LoadLargeWallpaperForLargeExternalScreen) {
+ LoadLargeWallpaperForLargeExternalScreen) {
LogIn(kTestUser1);
WaitAsyncWallpaperLoad();
gfx::ImageSkia wallpaper = controller_->GetWallpaper();
@@ -183,10 +181,8 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
// This test is similar to LoadLargeWallpaperForExternalScreen test. Instead of
// testing default wallpaper, it tests custom wallpaper.
-//
-// Temporarily disabled due to metacity switch: http://crbug.com/167114
IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
- DISABLED_LoadCustomLargeWallpaperForLargeExternalScreen) {
+ LoadCustomLargeWallpaperForLargeExternalScreen) {
WallpaperManager* wallpaper_manager = WallpaperManager::Get();
LogIn(kTestUser1);
// Wait for default wallpaper loaded.
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_drag_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698