Reload wallpaper when display configuration changes.

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"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
+#include "ash/test/test_user_wallpaper_delegate.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/test/test_browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ skipping 77 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     // Ash shell initialization creates wallpaper. Reset it so we can manually
     // control wallpaper creation and animation in our tests.
     internal::RootWindowController* root_window_controller =
         Shell::GetPrimaryRootWindowController();
     root_window_controller->SetWallpaperController(NULL);
     root_window_controller->SetAnimatingWallpaperController(NULL);
     controller_ = Shell::GetInstance()->desktop_background_controller();
+    wallpaper_delegate_ = static_cast<test::TestUserWallpaperDelegate*>(
+        Shell::GetInstance()->user_wallpaper_delegate());
+    controller_->set_wallpaper_reload_delay_for_test(0);
   }
 
  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;
 
@@ skipping 122 matching lines @@
   // Custom command line passed to DesktopBackgroundController by
   // WriteWallpapersAndSetFlags().
   CommandLine command_line_;
 
   // Directory created by WriteWallpapersAndSetFlags() to store default
   // wallpaper images.
   scoped_ptr<base::ScopedTempDir> wallpaper_dir_;
 
   DesktopBackgroundController* controller_;  // Not owned.
 
+  test::TestUserWallpaperDelegate* wallpaper_delegate_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundControllerTest);
 };
 
 TEST_F(DesktopBackgroundControllerTest, BasicReparenting) {
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // Wallpaper view/window exists in the desktop background container and
@@ skipping 141 matching lines @@
               GetController(false)->widget()));
 
   EXPECT_TRUE(root_window_controller->wallpaper_controller());
   EXPECT_FALSE(root_window_controller->animating_wallpaper_controller()->
                GetController(false));
   // The desktop controller should be the last created animating controller.
   EXPECT_EQ(animating_controller,
             root_window_controller->wallpaper_controller());
 }
 
-TEST_F(DesktopBackgroundControllerTest, GetAppropriateResolution) {
-  // TODO(derat|oshima|bshe): Configuring desktops seems busted on Win8,
-  // even when just a single display is being used -- the small wallpaper
-  // is used instead of the large one. Track down the cause of the problem
-  // and only use a SupportsMultipleDisplays() clause for the dual-display
-  // code below.
-  if (!SupportsMultipleDisplays())
+TEST_F(DesktopBackgroundControllerTest, DisplayChange) {
+  // TODO(derat|oshima|bshe): Host windows can't be resized on Win8.
+  if (!SupportsHostWindowResize())
     return;
 
   test::DisplayManagerTestApi display_manager_test_api(
       Shell::GetInstance()->display_manager());
 
   // Small wallpaper images should be used for configurations less than or
   // equal to kSmallWallpaperMaxWidth by kSmallWallpaperMaxHeight, even if
   // multiple displays are connected.
   display_manager_test_api.UpdateDisplay("800x600");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_SMALL,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(0,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
   display_manager_test_api.UpdateDisplay("800x600,800x600");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_SMALL,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(0,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
   display_manager_test_api.UpdateDisplay("1366x800");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_SMALL,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
 
   // At larger sizes, large wallpapers should be used.
   display_manager_test_api.UpdateDisplay("1367x800");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_LARGE,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
   display_manager_test_api.UpdateDisplay("1367x801");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_LARGE,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
   display_manager_test_api.UpdateDisplay("2560x1700");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_LARGE,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
 
   // Rotated smaller screen may use larger image.
   display_manager_test_api.UpdateDisplay("800x600/r");
+  RunAllPendingInMessageLoop();
+  EXPECT_EQ(1,

[bshe, 2013/09/25 21:00:17]

nit: probably move this EXPECT_EQ after line 485 to be consistent with the style
of all other expects.

[oshima, 2013/09/25 22:29:52]

Done.

+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
   EXPECT_EQ(WALLPAPER_RESOLUTION_SMALL,
             controller_->GetAppropriateResolution());
   display_manager_test_api.UpdateDisplay("800x600/r,800x600");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_SMALL,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
   display_manager_test_api.UpdateDisplay("1366x800/r");
+  RunAllPendingInMessageLoop();
   EXPECT_EQ(WALLPAPER_RESOLUTION_LARGE,
             controller_->GetAppropriateResolution());
+  EXPECT_EQ(1,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
+  // Max display size didn't chagne.
+  display_manager_test_api.UpdateDisplay("900x800/r,400x1366");
+  RunAllPendingInMessageLoop();
+  EXPECT_EQ(0,
+            wallpaper_delegate_->GetUpdateWallpaperCountAndReset());
+
 }
 
 // Test that DesktopBackgroundController loads the appropriate wallpaper
 // images as specified via command-line flags in various situations.
 // Splitting these into separate tests avoids needing to run animations.
 // TODO(derat): Combine these into a single test -- see
 // RunDesktopControllerAnimation()'s TODO.
 TEST_F(DesktopBackgroundControllerTest, SmallDefaultWallpaper) {
   if (!SupportsMultipleDisplays())
     return;
@@ skipping 109 matching lines @@
       DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString());
 
   // Maximum width and height belongs to different displays.
   UpdateDisplay("400x300,100x500");
   EXPECT_EQ(
       "400x500",
       DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString());
 }
 
 }  // namespace ash