Revert of Remove more unretained

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

 // Copyright 2014 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/users/wallpaper/wallpaper_manager.h"
 
 #include <numeric>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 508 matching lines @@
   registry->RegisterDictionaryPref(prefs::kUsersWallpaperInfo);
   registry->RegisterDictionaryPref(kUserWallpapers);
   registry->RegisterDictionaryPref(kUserWallpapersProperties);
 }
 
 void WallpaperManager::AddObservers() {
   show_user_name_on_signin_subscription_ =
       CrosSettings::Get()->AddSettingsObserver(
           kAccountsPrefShowUserNamesOnSignIn,
           base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper,
-                     weak_factory_.GetWeakPtr()));
+                     base::Unretained(this)));
 }
 
 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
   // Some browser tests do not have a shell instance. As no wallpaper is needed
   // in these tests anyway, avoid loading one, preventing crashes and speeding
   // up the tests.
   if (!ash::Shell::HasInstance())
     return;
 
   WallpaperInfo info;
@@ skipping 349 matching lines @@
     // Block shutdown on this task. Otherwise, we may lose the custom wallpaper
     // that the user selected.
     scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
         BrowserThread::GetBlockingPool()
             ->GetSequencedTaskRunnerWithShutdownBehavior(
                 sequence_token_, base::SequencedWorkerPool::BLOCK_SHUTDOWN);
     // TODO(bshe): This may break if RawImage becomes RefCountedMemory.
     blocking_task_runner->PostTask(
         FROM_HERE,
         base::Bind(&WallpaperManager::SaveCustomWallpaper,
-                   weak_factory_.GetWeakPtr(),
+                   base::Unretained(this),
                    user_id_hash,
                    base::FilePath(wallpaper_info.file),
                    wallpaper_info.layout,
                    base::Passed(deep_copy.Pass())));
   }
 
   std::string relative_path = base::FilePath(user_id_hash).Append(file).value();
   // User's custom wallpaper path is determined by relative path and the
   // appropriate wallpaper resolution in GetCustomWallpaperInternal.
   WallpaperInfo info = {
@@ skipping 264 matching lines @@
 
     base::FilePath wallpaper_dir;
     base::FilePath wallpaper_path;
     if (info.type == User::CUSTOMIZED || info.type == User::POLICY) {
       const char* sub_dir = GetCustomWallpaperSubdirForCurrentResolution();
       base::FilePath wallpaper_path = GetCustomWallpaperDir(sub_dir);
       wallpaper_path = wallpaper_path.Append(info.file);
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&WallpaperManager::GetCustomWallpaperInternal,
-                     weak_factory_.GetWeakPtr(),
+                     base::Unretained(this),
                      user_id,
                      info,
                      wallpaper_path,
                      false /* do not update wallpaper */,
                      base::Passed(MovableOnDestroyCallbackHolder())));
       return;
     }
     LoadWallpaper(user_id,
                   info,
                   false /* do not update wallpaper */,
@@ skipping 199 matching lines @@
       IsRunningSequenceOnCurrentThread(sequence_token_));
   if (MoveCustomWallpaperDirectory(
           kOriginalWallpaperSubDir, user_id, user_id_hash)) {
     // Consider success if the original wallpaper is moved to the new directory.
     // Original wallpaper is the fallback if the correct resolution wallpaper
     // can not be found.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&WallpaperManager::MoveCustomWallpapersSuccess,
-                   weak_factory_.GetWeakPtr(),
+                   base::Unretained(this),
                    user_id,
                    user_id_hash));
   }
   MoveCustomWallpaperDirectory(kLargeWallpaperSubDir, user_id, user_id_hash);
   MoveCustomWallpaperDirectory(kSmallWallpaperSubDir, user_id, user_id_hash);
   MoveCustomWallpaperDirectory(
       kThumbnailWallpaperSubDir, user_id, user_id_hash);
 }
 
 void WallpaperManager::MoveCustomWallpapersSuccess(
@@ skipping 11 matching lines @@
         !UserManager::Get()->IsUserNonCryptohomeDataEphemeral(user_id);
     SetUserWallpaperInfo(user_id, info, is_persistent);
   }
 }
 
 void WallpaperManager::MoveLoggedInUserCustomWallpaper() {
   const User* logged_in_user = UserManager::Get()->GetLoggedInUser();
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&WallpaperManager::MoveCustomWallpapersOnWorker,
-                 weak_factory_.GetWeakPtr(),
+                 base::Unretained(this),
                  logged_in_user->email(),
                  logged_in_user->username_hash()));
 }
 
 void WallpaperManager::GetCustomWallpaperInternal(
     const std::string& user_id,
     const WallpaperInfo& info,
     const base::FilePath& wallpaper_path,
     bool update_wallpaper,
     MovableOnDestroyCallbackHolder on_finish) {
@@ skipping 15 matching lines @@
     valid_path =
         GetCustomWallpaperPath(kOriginalWallpaperSubDir, user_id, info.file);
   }
 
   if (!base::PathExists(valid_path)) {
     LOG(ERROR) << "Failed to load previously selected custom wallpaper. " <<
                   "Fallback to default wallpaper";
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&WallpaperManager::DoSetDefaultWallpaper,
-                                       weak_factory_.GetWeakPtr(),
+                                       base::Unretained(this),
                                        user_id,
                                        base::Passed(on_finish.Pass())));
   } else {
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&WallpaperManager::StartLoad,
-                                       weak_factory_.GetWeakPtr(),
+                                       base::Unretained(this),
                                        user_id,
                                        info,
                                        update_wallpaper,
                                        valid_path,
                                        base::Passed(on_finish.Pass())));
   }
 }
 
 void WallpaperManager::OnWallpaperDecoded(
     const std::string& user_id,
@@ skipping 416 matching lines @@
   loaded_wallpapers_++;
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1, 0);
   bitmap.allocPixels();
   bitmap.eraseColor(kDefaultWallpaperColor);
   const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   default_wallpaper_image_.reset(new UserImage(image));
 }
 
 }  // namespace chromeos