Remove call to UserManager::Get when initializing UserManager

chrome/browser/chromeos/login/wallpaper_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 
 #include <string>
 
 #include "ash/desktop_background/desktop_background_resources.h"
@@ skipping 73 matching lines @@
   void RestartTimer();
 
   // Tries to load user image from disk; if successful, sets it for the user,
   // and updates Local State.
   void SetUserWallpaperFromFile(const std::string& username,
                                 const FilePath& path,
                                 ash::WallpaperLayout layout,
                                 base::WeakPtr<WallpaperDelegate> delegate);
 
   // Set |email|'s wallpaper |type|, |index| and local date to local state.
+  // When |is_persistent| is false, changes are kept in memory only.
   void SaveUserWallpaperProperties(const std::string& email,

[Ivan Korotkov, 2012/08/17 19:10:57]

Let's rename it to Set... because Save... already implies persistence.

[bshe, 2012/08/17 19:21:36]

Done.

                                    User::WallpaperType type,
-                                   int index);
+                                   int index,
+                                   bool is_persistent);
 
   // Sets one of the default wallpapers for the specified user and saves this
   // settings in local state.
-  void SetInitialUserWallpaper(const std::string& username);
+  void SetInitialUserWallpaper(const std::string& username, bool is_persistent);
 
   // Saves |username| selected wallpaper information to local state.
   void SaveUserWallpaperInfo(const std::string& username,
                              const std::string& file_name,
                              ash::WallpaperLayout layout,
                              User::WallpaperType type);
 
   // Sets last selected user on user pod row.
   void SetLastSelectedUser(const std::string& last_selected_user);
 
@@ skipping 67 matching lines @@
   void SaveWallpaper(const std::string& path, const UserImage& wallpaper);
 
   // Saves wallpaper to file, post task to generate thumbnail and updates local
   // state preferences.
   void SetWallpaper(const std::string& username,
                     ash::WallpaperLayout layout,
                     User::WallpaperType type,
                     base::WeakPtr<WallpaperDelegate> delegate,
                     const UserImage& wallpaper);
 
+  // Returns flase if current logged in user is ephemeral and |email| is the
+  // email of current logged in user. We should not persist data for ephemeral

[Ivan Korotkov, 2012/08/17 19:10:57]

Please rephrase this to what the function actually serves for, i.e.: // Whether
wallpaper data should be persisted for user |email|.

[bshe, 2012/08/17 19:21:36]

Done.

+  // user.
+  // Note: this function can not be called in SaveUserWallpaperProperties. It
+  // will create a deadlock. (issue 142440)
+  bool ShouldPersistDataForUser(const std::string& email);
+
   // Sets wallpaper to image in |user_image| with |layout|.
   void OnWallpaperLoaded(ash::WallpaperLayout layout,
                          const UserImage& user_image);
 
   // Overridden from chromeos::ResumeObserver
   virtual void SystemResumed() OVERRIDE;
 
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
 
@@ skipping 21 matching lines @@
   content::NotificationRegistrar registrar_;
 
   base::OneShotTimer<WallpaperManager> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_