Remove call to UserManager::Get when initializing UserManager

chrome/browser/chromeos/login/wallpaper_manager.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/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 301 matching lines @@
     BatchUpdateWallpaper();
   } else {
     // Set up a one shot timer which will batch update wallpaper at midnight.
     timer_.Start(FROM_HERE,
                  base::TimeDelta::FromSeconds(remaining_seconds),
                  this,
                  &WallpaperManager::BatchUpdateWallpaper);
   }
 }
 
-void WallpaperManager::SaveUserWallpaperProperties(const std::string& email,
-                                                   User::WallpaperType type,
-                                                   int index) {
+void WallpaperManager::SetUserWallpaperProperties(const std::string& email,
+                                                  User::WallpaperType type,
+                                                  int index,
+                                                  bool is_persistent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   current_user_wallpaper_type_ = type;
   current_user_wallpaper_index_ = index;
-  // Ephemeral users can not save data to local state. We just cache the index
-  // in memory for them.
-  if (UserManager::Get()->IsCurrentUserEphemeral())
+  if (!is_persistent)
     return;
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate wallpaper_update(local_state,
       UserManager::kUserWallpapersProperties);
 
   base::DictionaryValue* wallpaper_properties = new base::DictionaryValue();
   wallpaper_properties->Set(kWallpaperTypeNodeName,
                             new base::FundamentalValue(type));
   wallpaper_properties->Set(kWallpaperIndexNodeName,
@@ skipping 11 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // For wallpapers, save the image without resizing.
   wallpaper_loader_->Start(
       path.value(), 0,
       base::Bind(&WallpaperManager::SetWallpaper,
                  base::Unretained(this), username, layout, User::CUSTOMIZED,
                  delegate));
 }
 
-void WallpaperManager::SetInitialUserWallpaper(const std::string& username) {
+void WallpaperManager::SetInitialUserWallpaper(const std::string& username,
+                                               bool is_persistent) {
   current_user_wallpaper_type_ = User::DEFAULT;
   if (username == kGuestUser)
     current_user_wallpaper_index_ = ash::GetGuestWallpaperIndex();
   else
     current_user_wallpaper_index_ = ash::GetDefaultWallpaperIndex();
-  SaveUserWallpaperProperties(username,
-                              current_user_wallpaper_type_,
-                              current_user_wallpaper_index_);
+  SetUserWallpaperProperties(username,
+                             current_user_wallpaper_type_,
+                             current_user_wallpaper_index_,
+                             is_persistent);
 
   // Some browser tests do not have shell instance. And it is not necessary to
   // create a wallpaper for these tests. Add HasInstance check to prevent tests
   // crash and speed up the tests by avoid loading wallpaper.
   if (ash::Shell::HasInstance()) {
     ash::Shell::GetInstance()->desktop_background_controller()->
         SetDefaultWallpaper(current_user_wallpaper_index_, false);
   }
 }
 
@@ skipping 35 matching lines @@
 
   if (!UserManager::Get()->IsKnownUser(email))
     return;
 
   User::WallpaperType type;
   int index;
   base::Time date;
   GetUserWallpaperProperties(email, &type, &index, &date);
   if (type == User::DAILY && date != base::Time::Now().LocalMidnight()) {
     index = ash::GetNextWallpaperIndex(index);
-    SaveUserWallpaperProperties(email, User::DAILY, index);
+    SetUserWallpaperProperties(email, User::DAILY, index,
+                               ShouldPersistDataForUser(email));
   } else if (type == User::CUSTOMIZED) {
     // For security reason, use default wallpaper instead of custom wallpaper
     // at login screen. The security issue is tracked in issue 143198. Once it
     // fixed, we should then only use custom wallpaper.
     if (!UserManager::Get()->IsUserLoggedIn()) {
       index = ash::GetDefaultWallpaperIndex();
     } else {
       FetchCustomWallpaper(email);
       return;
     }
@@ skipping 32 matching lines @@
     int index = 0;
     base::Time last_modification_date;
     const UserList& users = user_manager->GetUsers();
     for (UserList::const_iterator it = users.begin();
          it != users.end(); ++it) {
       std::string email = (*it)->email();
       GetUserWallpaperProperties(email, &type, &index, &last_modification_date);
       base::Time current_date = base::Time::Now().LocalMidnight();
       if (type == User::DAILY && current_date != last_modification_date) {
         index = ash::GetNextWallpaperIndex(index);
-        SaveUserWallpaperProperties(email, type, index);
+        SetUserWallpaperProperties(email, type, index, true);
       }
       // Force a wallpaper update for logged in / last selected user.
       // TODO(bshe): Notify lock screen, wallpaper picker UI to update wallpaper
       // as well.
       if (user_manager->IsUserLoggedIn() &&
           email == user_manager->GetLoggedInUser().email()) {
         SetUserWallpaper(email);
       } else if (show_users &&
                  email == last_selected_user_) {
         SetUserWallpaper(email);
@@ skipping 139 matching lines @@
 void WallpaperManager::SetWallpaper(const std::string& username,
                                     ash::WallpaperLayout layout,
                                     User::WallpaperType type,
                                     base::WeakPtr<WallpaperDelegate> delegate,
                                     const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::string wallpaper_path =
       GetWallpaperPathForUser(username, false).value();
 
-  // TODO(bshe): Ephemeral user should not save custom wallpaper to disk.
-  BrowserThread::PostTask(
-      BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&WallpaperManager::SaveWallpaper,
-                 base::Unretained(this), wallpaper_path, wallpaper));
+  bool is_persistent = ShouldPersistDataForUser(username);
+
+  if (is_persistent) {
+    BrowserThread::PostTask(
+        BrowserThread::FILE,
+        FROM_HERE,
+        base::Bind(&WallpaperManager::SaveWallpaper,
+                   base::Unretained(this), wallpaper_path, wallpaper));
+  }
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&WallpaperManager::GenerateUserWallpaperThumbnail,
                  base::Unretained(this), username, type, delegate,
                  wallpaper.image()));
 
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper.image(), layout);
-  SaveUserWallpaperProperties(username, type, layout);
+  SetUserWallpaperProperties(username, type, layout, is_persistent);
+}
+
+bool WallpaperManager::ShouldPersistDataForUser(const std::string& email) {
+  UserManager* user_manager = UserManager::Get();
+  return !(email == user_manager->GetLoggedInUser().email() &&
+           user_manager->IsCurrentUserEphemeral());
 }
 
 void WallpaperManager::OnWallpaperLoaded(ash::WallpaperLayout layout,
                                          const UserImage& user_image) {
   SetWallpaperFromImageSkia(user_image.image(), layout);
 }
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos