Some cleanup of WallpaperManager.

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/ash_resources/grit/ash_resources.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
@@ skipping 146 matching lines @@
         wallpaper_path,
         reinterpret_cast<const char*>(image_data->front()),
         image_data->size());
     EXPECT_EQ(static_cast<int>(image_data->size()), written);
   }
 
   int LoadedWallpapers() {
     return WallpaperManager::Get()->loaded_wallpapers();
   }
 
+  void ClearDisposableWallpaperCache() {
+    WallpaperManager::Get()->ClearDisposableWallpaperCache();
+  }
+
   // Creates a test image of size 1x1.
   gfx::ImageSkia CreateTestImage(int width, int height, SkColor color) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     bitmap.allocPixels();
     bitmap.eraseColor(color);
     return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   }
 
   // Writes a JPEG image of the specified size and color to |path|. Returns
@@ skipping 221 matching lines @@
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
   wallpaper_manager->SetUserWallpaperNow(kTestUser1);
   WaitAsyncWallpaperLoadFinished();
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper after the initial one finished. It should be
   // prevented.
   wallpaper_manager->SetUserWallpaperNow(kTestUser1);
   WaitAsyncWallpaperLoadFinished();
   EXPECT_EQ(1, LoadedWallpapers());
-  wallpaper_manager->ClearDisposableWallpaperCache();
+  ClearDisposableWallpaperCache();
 
   // Change wallpaper to a custom wallpaper.
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
       kTestUser1Hash,
       id);
   SaveUserWallpaperData(small_wallpaper_path,
                         kSmallWallpaperResourceId);
 
@@ skipping 269 matching lines @@
                                                red_wallpaper,
                                                WALLPAPER_LAYOUT_CENTER,
                                                true);
   WaitAsyncWallpaperLoadFinished();
   // SetWallpaperFromImageSkia should update wallpaper cache when multi-profile
   // is turned on.
   EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
   EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(red_wallpaper));
 
   gfx::ImageSkia green_wallpaper = CreateTestImage(SK_ColorGREEN);
-  chromeos::UserImage image(green_wallpaper);
   wallpaper_manager->SetCustomWallpaper(kTestUser1,
                                         kTestUser1Hash,
                                         "dummy",  // dummy file name
                                         WALLPAPER_LAYOUT_CENTER,
                                         User::CUSTOMIZED,
-                                        image,
+                                        green_wallpaper,
                                         true);
   WaitAsyncWallpaperLoadFinished();
   // SetCustomWallpaper should also update wallpaper cache when multi-profile is
   // turned on.
   EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
   EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(green_wallpaper));
 
   wallpaper_manager->SetDefaultWallpaperNow(kTestUser1);
   WaitAsyncWallpaperLoadFinished();
   // SetDefaultWallpaper should invalidate the user's wallpaper cache.
@@ skipping 202 matching lines @@
   // Start loading the default wallpaper.
   UpdateDisplay("640x480");
   WriteWallpapers();
   UserManager::Get()->UserLoggedIn(UserManager::kStubUser, "test_hash", false);
 
   WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
 
   // Custom wallpaper should be applied immediately, canceling the default
   // wallpaper load task.
   gfx::ImageSkia image = CreateTestImage(640, 480, kCustomWallpaperColor);
-  UserImage wallpaper(image);
   WallpaperManager::Get()->SetCustomWallpaper(UserManager::kStubUser,
                                               "test_hash",
                                               "test-nofile.jpeg",
                                               WALLPAPER_LAYOUT_STRETCH,
                                               User::CUSTOMIZED,
-                                              wallpaper,
+                                              image,
                                               true);
   WaitAsyncWallpaperLoadFinished();
 
   EXPECT_TRUE(
       ImageIsNearColor(controller_->GetWallpaper(), kCustomWallpaperColor));
 
   WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
   WaitAsyncWallpaperLoadFinished();
 
   EXPECT_TRUE(
       ImageIsNearColor(controller_->GetWallpaper(), kSmallWallpaperColor));
 }
 
 }  // namespace chromeos