Revert the disabling of tests that I did while trying to switch to metacity.

chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
@@ skipping 119 matching lines @@
   DesktopBackgroundController* controller_;
   PrefService* local_state_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBrowserTest);
 };
 
 // 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();
 
   // Display is initialized to 800x600. The small resolution default wallpaper
   // is expected.
   EXPECT_EQ(kExpectedSmallWallpaperWidth, wallpaper.width());
   EXPECT_EQ(kExpectedSmallWallpaperHeight, wallpaper.height());
 
   // Hook up another 800x600 display.
@@ skipping 22 matching lines @@
   WaitAsyncWallpaperLoad();
   wallpaper = controller_->GetWallpaper();
 
   // The large resolution default wallpaper is expected.
   EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
   EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
 }
 
 // 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.
   WaitAsyncWallpaperLoad();
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
       kTestUser1,
       id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
@@ skipping 252 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UsePreMigrationWallpaperInfo) {
   LogIn(kTestUser1);
   WaitAsyncWallpaperLoad();
   // This test should finish normally. If timeout, it is probably because chrome
   // can not handle pre migrated user profile (M21 profile or older).
 }
 
 }  // namepace chromeos