Remove call to UserManager::Get when initializing UserManager

chrome/browser/chromeos/login/user_manager_impl.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/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
@@ skipping 258 matching lines @@
     logged_in_user_ = *logged_in_user;
     users_.erase(logged_in_user);
   }
   // This user must be in the front of the user list.
   users_.insert(users_.begin(), logged_in_user_);
 
   if (is_current_user_new_) {
     SaveUserDisplayName(GetLoggedInUser().email(),
         UTF8ToUTF16(GetLoggedInUser().GetAccountName(true)));
     SetInitialUserImage(email);
-    WallpaperManager::Get()->SetInitialUserWallpaper(email);
+    WallpaperManager::Get()->SetInitialUserWallpaper(email, true);
   } else {
     int image_index = logged_in_user_->image_index();
     // If current user image is profile image, it needs to be refreshed.
     bool download_profile_image = image_index == User::kProfileImageIndex;
     if (download_profile_image)
       InitDownloadedProfileImage();
 
     // Download user's profile data (full name and optionally image) to see if
     // it has changed.
     BrowserThread::PostDelayedTask(
@@ skipping 33 matching lines @@
 
   NotifyOnLogin();
 }
 
 void UserManagerImpl::DemoUserLoggedIn() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
   logged_in_user_ = CreateUser(kDemoUser, /* is_ephemeral= */ true);
   SetInitialUserImage(kDemoUser);
-  WallpaperManager::Get()->SetInitialUserWallpaper(kDemoUser);
+  WallpaperManager::Get()->SetInitialUserWallpaper(kDemoUser, false);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::GuestUserLoggedIn() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   is_current_user_ephemeral_ = true;
-  WallpaperManager::Get()->SetInitialUserWallpaper(kGuestUser);
+  WallpaperManager::Get()->SetInitialUserWallpaper(kGuestUser, false);
   logged_in_user_ = CreateUser(kGuestUser, /* is_ephemeral= */ true);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
   logged_in_user_ = CreateUser(email, /* is_ephemeral= */ true);
   SetInitialUserImage(email);
-  WallpaperManager::Get()->SetInitialUserWallpaper(email);
+  WallpaperManager::Get()->SetInitialUserWallpaper(email, false);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::SessionStarted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   session_started_ = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
@@ skipping 559 matching lines @@
       const UserList& users = GetUsers();
       for (UserList::const_iterator it = users.begin();
            it != users.end();
            ++it) {
         std::string username = (*it)->email();
         if (user_wallpapers->GetIntegerWithoutPathExpansion((username),
             &index)) {
           DictionaryPrefUpdate prefs_wallpapers_update(local_state,
                                                        kUserWallpapers);
           prefs_wallpapers_update->RemoveWithoutPathExpansion(username, NULL);
-          WallpaperManager::Get()->SaveUserWallpaperProperties(username,
-                                                               User::DEFAULT,
-                                                               index);
+          WallpaperManager::Get()->SetUserWallpaperProperties(username,
+                                                              User::DEFAULT,
+                                                              index,
+                                                              true);
         } else {
           // Before M20, wallpaper index is not saved into LocalState unless
           // user specifically sets a wallpaper. After M20, the default
           // wallpaper index is saved to LocalState as soon as a new user login.
           // When migrating wallpaper index from M20 to M21, we only migrate
           // data that is in LocalState. This cause a problem when users login
           // on a M20 device and then update the device to M21. The default
           // wallpaper index failed to migrate because it was not saved into
           // LocalState. Then we assume that all users have index saved in
           // LocalState in M21. This is not true and it results an empty
           // wallpaper for those users as described in cr/130685. So here we use
           // default wallpaper for users that exist in user list but does not
           // have an index saved in LocalState.
-          WallpaperManager::Get()->SaveUserWallpaperProperties(username,
-              User::DEFAULT, ash::GetDefaultWallpaperIndex());
+          WallpaperManager::Get()->SetUserWallpaperProperties(username,
+              User::DEFAULT, ash::GetDefaultWallpaperIndex(), true);
         }
       }
     }
   }
 }
 
 void UserManagerImpl::SaveLoggedInUserWallpaperProperties(
     User::WallpaperType type, int index) {
-  WallpaperManager::Get()->SaveUserWallpaperProperties(
-      GetLoggedInUser().email(), type, index);
+  // Ephemeral users can not save data to local state.
+  // We just cache the index in memory for them.
+  bool is_persistent = !IsCurrentUserEphemeral();
+  WallpaperManager::Get()->SetUserWallpaperProperties(
+      GetLoggedInUser().email(), type, index, is_persistent);
 }
 
 void UserManagerImpl::SetUserImage(const std::string& username,
                                    int image_index,
                                    const GURL& image_url,
                                    const UserImage& user_image) {
   User* user = const_cast<User*>(FindUser(username));
   // User may have been removed by now.
   if (user) {
     // For existing users, a valid image index should have been set upon loading
@@ skipping 100 matching lines @@
   DVLOG(1) << "Saving path to user image in Local State.";
 
   NotifyLocalStateChanged();
 }
 
 void UserManagerImpl::SaveWallpaperToLocalState(const std::string& username,
     const std::string& wallpaper_path,
     ash::WallpaperLayout layout,
     User::WallpaperType type) {
   // TODO(bshe): We probably need to save wallpaper_path instead of index.
-  WallpaperManager::Get()->SaveUserWallpaperProperties(username, type, layout);
+  WallpaperManager::Get()->SetUserWallpaperProperties(
+      username, type, layout, true);
 }
 
 bool UserManagerImpl::SaveBitmapToFile(const UserImage& user_image,
                                        const FilePath& image_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   const UserImage::RawImage* encoded_image = NULL;
   if (user_image.has_animated_image()) {
     encoded_image = &user_image.animated_image();
   } else if (user_image.has_raw_image()) {
@@ skipping 278 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos