Remove use of index in wallpaper picker code and some refactor

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_resources.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"
 #include "ash/test/display_manager_test_api.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 19 matching lines @@
 int kExpectedLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
 #else
 // The defualt wallpaper for non official build is a gradient wallpaper which
 // stretches to fit screen.
 int kExpectedSmallWallpaperWidth = 256;
 int kExpectedSmallWallpaperHeight = ash::kSmallWallpaperMaxHeight;
 int kExpectedLargeWallpaperWidth = 256;
 int kExpectedLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
 #endif
 
-
 }  // namespace
 
 class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
                                     public DesktopBackgroundControllerObserver {
  public:
   WallpaperManagerBrowserTest () : controller_(NULL),
                                    local_state_(NULL) {
   }
 
   virtual ~WallpaperManagerBrowserTest () {}
@@ skipping 62 matching lines @@
 
 // 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.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
 
   WallpaperInfo info = {
       "",
-      CENTER_CROPPED,
+      WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::DEFAULT,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   SetUserWallpaper(kTestUser1);
   WaitAsyncWallpaperLoad();
   gfx::ImageSkia wallpaper = controller_->GetWallpaper();
 
   // Display is initialized to 800x600. The small resolution default wallpaper
@@ skipping 23 matching lines @@
 // This test is similar to LoadLargeWallpaperForExternalScreen test. Instead of
 // testing default wallpaper, it tests custom wallpaper.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadCustomLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   FilePath small_wallpaper_path =
       wallpaper_manager->GetWallpaperPathForUser(kTestUser1, true);
   FilePath large_wallpaper_path =
       wallpaper_manager->GetWallpaperPathForUser(kTestUser1, false);
 
-  int index = ash::GetDefaultWallpaperIndex();
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
-                        GetWallpaperViewInfo(index, SMALL).id);
+                        ash::kDefaultSmallWallpaper.idr);
   SaveUserWallpaperData(kTestUser1,
                         large_wallpaper_path,
-                        GetWallpaperViewInfo(index, LARGE).id);
+                        ash::kDefaultLargeWallpaper.idr);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       "DUMMY",
-      CENTER_CROPPED,
+      WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   // Add user |kTestUser1|.
 
   SetUserWallpaper(kTestUser1);
   WaitAsyncWallpaperLoad();
   gfx::ImageSkia wallpaper = controller_->GetWallpaper();
@@ skipping 24 matching lines @@
 
 // If chrome tries to reload the same wallpaper twice, the latter request should
 // be prevented. Otherwise, there are some strange animation issues as
 // described in crbug.com/158383.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        PreventReloadingSameWallpaper) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   FilePath small_wallpaper_path =
       wallpaper_manager->GetWallpaperPathForUser(kTestUser1, true);
 
-  int index = ash::GetDefaultWallpaperIndex();
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
-                        GetWallpaperViewInfo(index, SMALL).id);
+                        ash::kDefaultSmallWallpaper.idr);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       "DUMMY",
-      CENTER_CROPPED,
+      WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
   SetUserWallpaper(kTestUser1);
@@ skipping 14 matching lines @@
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
   SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
   WaitAsyncWallpaperLoad();
   SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
 }
 
 }  // namepace chromeos