ash: Add test for wallpaper-switching bug.

ash/desktop_background/desktop_background_controller_unittest.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 "ash/desktop_background/desktop_background_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/ash_switches.h"
@@ skipping 111 matching lines @@
   }
 
  protected:
   // Colors used for different default wallpapers by
   // WriteWallpapersAndSetFlags().
   static const SkColor kLargeWallpaperColor = SK_ColorRED;
   static const SkColor kSmallWallpaperColor = SK_ColorGREEN;
   static const SkColor kLargeGuestWallpaperColor = SK_ColorBLUE;
   static const SkColor kSmallGuestWallpaperColor = SK_ColorYELLOW;
 
+  // A color that can be passed to CreateImage(). Specifically chosen to not
+  // conflict with any of the default wallpaper colors.
+  static const SkColor kCustomWallpaperColor = SK_ColorMAGENTA;
+
   // Dimension used for width and height of default wallpaper images. A
   // small value is used to minimize the amount of time spent compressing
   // and writing images.
   static const int kWallpaperSize = 2;
 
   // Creates an image of size |size|.
-  gfx::ImageSkia CreateImage(int width, int height) {
+  gfx::ImageSkia CreateImage(int width, int height, SkColor color) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     bitmap.allocPixels();
+    bitmap.eraseColor(color);
     gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
     return image;
   }
 
   // Runs kAnimatingDesktopController's animation to completion.
   // TODO(bshe): Don't require tests to run animations; it's slow.
   void RunDesktopControllerAnimation() {
     internal::DesktopBackgroundWidgetController* controller =
         Shell::GetPrimaryRootWindowController()->
         animating_wallpaper_controller()->GetController(false);
@@ skipping 281 matching lines @@
             root_window_controller->wallpaper_controller());
 }
 
 TEST_F(DesktopBackgroundControllerTest, DisplayChange) {
   // TODO(derat|oshima|bshe): Host windows can't be resized on Win8.
   if (!SupportsHostWindowResize())
     return;
 
   // Set the wallpaper to ensure that UpdateWallpaper() will be called when the
   // display configuration changes.
-  gfx::ImageSkia image = CreateImage(640, 480);
+  gfx::ImageSkia image = CreateImage(640, 480, kCustomWallpaperColor);
   wallpaper_delegate_->set_custom_wallpaper(image);
   controller_->SetCustomWallpaper(image, WALLPAPER_LAYOUT_STRETCH);
 
   // Small wallpaper images should be used for configurations less than or
   // equal to kSmallWallpaperMaxWidth by kSmallWallpaperMaxHeight, even if
   // multiple displays are connected.
   test::DisplayManagerTestApi display_manager_test_api(
       Shell::GetInstance()->display_manager());
   display_manager_test_api.UpdateDisplay("800x600");
   RunAllPendingInMessageLoop();
@@ skipping 142 matching lines @@
 }
 
 TEST_F(DesktopBackgroundControllerTest, ResizeCustomWallpaper) {
   if (!SupportsMultipleDisplays())
     return;
 
   test::DisplayManagerTestApi display_manager_test_api(
       Shell::GetInstance()->display_manager());
   display_manager_test_api.UpdateDisplay("320x200");
 
-  gfx::ImageSkia image = CreateImage(640, 480);
+  gfx::ImageSkia image = CreateImage(640, 480, kCustomWallpaperColor);
 
   // Set the image as custom wallpaper, wait for the resize to finish, and check
   // that the resized image is the expected size.
   controller_->SetCustomWallpaper(image, WALLPAPER_LAYOUT_STRETCH);
   EXPECT_TRUE(image.BackedBySameObjectAs(controller_->GetWallpaper()));
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   content::RunAllPendingInMessageLoop();
   gfx::ImageSkia resized_image = controller_->GetWallpaper();
   EXPECT_FALSE(image.BackedBySameObjectAs(resized_image));
   EXPECT_EQ(gfx::Size(320, 200).ToString(), resized_image.size().ToString());
@@ skipping 41 matching lines @@
       "500x600",
       DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString());
 
   // Maximum width and height belongs to different displays.
   UpdateDisplay("400x300,100x500");
   EXPECT_EQ(
       "400x500",
       DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString());
 }
 
+TEST_F(DesktopBackgroundControllerTest, SwitchBetweenDefaultAndCustom) {
+  // Start loading the default wallpaper.
+  UpdateDisplay("640x480");
+  WriteWallpapersAndSetFlags();
+  ASSERT_TRUE(controller_->SetDefaultWallpaper(false));
+
+  // Custom wallpaper should be applied immediately, canceling the default
+  // wallpaper load task.
+  gfx::ImageSkia image = CreateImage(640, 480, kCustomWallpaperColor);
+  controller_->SetCustomWallpaper(image, WALLPAPER_LAYOUT_STRETCH);
+  EXPECT_TRUE(ImageIsNearColor(controller_->GetWallpaper(),
+                               kCustomWallpaperColor));
+
+  // A call to SetDefaultWallpaper() should return true now, indicating that a
+  // new load task was started (since the previous one was interrupted by
+  // SetCustomWallpaper()). See http://crbug.com/327443.
+  TestObserver observer(controller_);
+  ASSERT_TRUE(controller_->SetDefaultWallpaper(false));
+  observer.WaitForWallpaperDataChanged();
+  EXPECT_TRUE(ImageIsNearColor(controller_->GetWallpaper(),
+                               kSmallWallpaperColor));
+}
+
 }  // namespace ash