ABANDONED: ash: Support changing default wallpaper at runtime.

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 83 matching lines @@
     controller.StartThreadedAnimationsIfNeeded();
     base::TimeTicks step_time = controller.animator()->last_step_time();
     element->Step(step_time + base::TimeDelta::FromMilliseconds(1000));
   }
 }
 
 }  // namespace
 
 class DesktopBackgroundControllerTest : public test::AshTestBase {
  public:
-  DesktopBackgroundControllerTest()
-      : command_line_(CommandLine::NO_PROGRAM),
-        controller_(NULL) {
-  }
+  DesktopBackgroundControllerTest() : controller_(NULL) {}
   virtual ~DesktopBackgroundControllerTest() {}
 
   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);
+    controller_->set_wallpaper_reload_delay_for_test(base::TimeDelta());
   }
 
  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 92 matching lines @@
     }
 
     return true;
   }
 
   // Initializes |wallpaper_dir_|, writes JPEG wallpaper images to it, and
   // passes |controller_| a command line instructing it to use the images.
   // Only needs to be called (once) by tests that want to test loading of
   // default wallpapers.
   void WriteWallpapersAndSetFlags() {
+    base::CommandLine cl(base::CommandLine::NO_PROGRAM);
+
     wallpaper_dir_.reset(new base::ScopedTempDir);
     ASSERT_TRUE(wallpaper_dir_->CreateUniqueTempDir());
 
     const base::FilePath kLargePath =
         wallpaper_dir_->path().Append(FILE_PATH_LITERAL("large.jpg"));
     ASSERT_TRUE(WriteJPEGFile(kLargePath, kWallpaperSize, kWallpaperSize,
                               kLargeWallpaperColor));
-    command_line_.AppendSwitchPath(
-        switches::kAshDefaultWallpaperLarge, kLargePath);
+    cl.AppendSwitchPath(switches::kAshDefaultWallpaperLarge, kLargePath);
 
     const base::FilePath kSmallPath =
         wallpaper_dir_->path().Append(FILE_PATH_LITERAL("small.jpg"));
     ASSERT_TRUE(WriteJPEGFile(kSmallPath, kWallpaperSize, kWallpaperSize,
                               kSmallWallpaperColor));
-    command_line_.AppendSwitchPath(
-        switches::kAshDefaultWallpaperSmall, kSmallPath);
+    cl.AppendSwitchPath(switches::kAshDefaultWallpaperSmall, kSmallPath);
 
     const base::FilePath kLargeGuestPath =
         wallpaper_dir_->path().Append(FILE_PATH_LITERAL("guest_large.jpg"));
     ASSERT_TRUE(WriteJPEGFile(kLargeGuestPath, kWallpaperSize, kWallpaperSize,
                               kLargeGuestWallpaperColor));
-    command_line_.AppendSwitchPath(
-        switches::kAshGuestWallpaperLarge, kLargeGuestPath);
+    cl.AppendSwitchPath(switches::kAshGuestWallpaperLarge, kLargeGuestPath);
 
     const base::FilePath kSmallGuestPath =
         wallpaper_dir_->path().Append(FILE_PATH_LITERAL("guest_small.jpg"));
     ASSERT_TRUE(WriteJPEGFile(kSmallGuestPath, kWallpaperSize, kWallpaperSize,
                               kSmallGuestWallpaperColor));
-    command_line_.AppendSwitchPath(
-        switches::kAshGuestWallpaperSmall, kSmallGuestPath);
+    cl.AppendSwitchPath(switches::kAshGuestWallpaperSmall, kSmallGuestPath);
 
-    controller_->set_command_line_for_testing(&command_line_);
+    controller_->InitWallpaperPathsFromCommandLine(&cl);
   }
 
-  // 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);
@@ skipping 405 matching lines @@
   // 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