Remove use of index in wallpaper picker code and some refactor

chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

Index: chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index c6c508e0831622e490d559b8e2161f0aacd45aae..d7933dd80046419d91e35b9c21840aa6633727c6 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -44,7 +43,6 @@ int kExpectedLargeWallpaperWidth = 256;
 int kExpectedLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
 #endif
 
-
 }  // namespace
 
 class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
@@ -127,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
 
   WallpaperInfo info = {
       "",
-      CENTER_CROPPED,
+      WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::DEFAULT,
       base::Time::Now().LocalMidnight()
   };
@@ -171,20 +169,19 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
   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()
   };
@@ -229,15 +226,14 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
   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()
   };