Revert 277655 "Remove more unretained"

trunk/src/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h

Index: trunk/src/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
===================================================================
--- trunk/src/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h	(revision 277819)
+++ trunk/src/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h	(working copy)
@@ -223,22 +223,6 @@
   // Returns the appropriate wallpaper resolution for all root windows.
   static WallpaperResolution GetAppropriateResolution();
 
-  // Returns custom wallpaper path. Append |sub_dir|, |user_id_hash| and |file|
-  // to custom wallpaper directory.
-  static base::FilePath GetCustomWallpaperPath(const char* sub_dir,
-                                               const std::string& user_id_hash,
-                                               const std::string& file);
-
-  // Record data for User Metrics Analysis.
-  static void RecordUma(User::WallpaperType type, int index);
-
-  // Saves original custom wallpaper to |path| (absolute path) on filesystem
-  // and starts resizing operation of the custom wallpaper if necessary.
-  static void SaveCustomWallpaper(const std::string& user_id_hash,
-                                  const base::FilePath& path,
-                                  ash::WallpaperLayout layout,
-                                  scoped_ptr<gfx::ImageSkia> image);
-
   void SetCommandLineForTesting(base::CommandLine* command_line);
 
   // Indicates imminent shutdown, allowing the WallpaperManager to remove any
@@ -252,6 +236,12 @@
   // wallpaper of logged in user.
   void EnsureLoggedInUserWallpaperLoaded();
 
+  // Returns custom wallpaper path. Append |sub_dir|, |user_id_hash| and |file|
+  // to custom wallpaper directory.
+  base::FilePath GetCustomWallpaperPath(const char* sub_dir,
+                                        const std::string& user_id_hash,
+                                        const std::string& file) const;
+
   // Gets wallpaper information of logged in user.
   bool GetLoggedInUserWallpaperInfo(WallpaperInfo* info);
 
@@ -453,6 +443,16 @@
                           MovableOnDestroyCallbackHolder on_finish,
                           const UserImage& user_image);
 
+  // Record data for User Metrics Analysis.
+  void RecordUma(User::WallpaperType type, int index) const;
+
+  // Saves original custom wallpaper to |path| (absolute path) on filesystem
+  // and starts resizing operation of the custom wallpaper if necessary.
+  void SaveCustomWallpaper(const std::string& user_id_hash,
+                           const base::FilePath& path,
+                           ash::WallpaperLayout layout,
+                           scoped_ptr<gfx::ImageSkia> image) const;
+
   // Creates new PendingWallpaper request (or updates currently pending).
   void ScheduleSetUserWallpaper(const std::string& user_id, bool delayed);