chromeos: Use gfx::ImageSkia instead of SkBitmap for downloaded profile image.

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 666 matching lines @@
 void UserManagerImpl::AddObserver(Observer* obs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_list_.AddObserver(obs);
 }
 
 void UserManagerImpl::RemoveObserver(Observer* obs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_list_.RemoveObserver(obs);
 }
 
-const SkBitmap& UserManagerImpl::DownloadedProfileImage() const {
+const gfx::ImageSkia& UserManagerImpl::DownloadedProfileImage() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return downloaded_profile_image_;
 }
 
 void UserManagerImpl::NotifyLocalStateChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
     Observer,
     observer_list_,
     LocalStateChanged(this));
@@ skipping 405 matching lines @@
   return true;
 }
 
 void UserManagerImpl::InitDownloadedProfileImage() {
   DCHECK(logged_in_user_);
   DCHECK_EQ(logged_in_user_->image_index(), User::kProfileImageIndex);
   if (downloaded_profile_image_.empty() && !logged_in_user_->image_is_stub()) {
     VLOG(1) << "Profile image initialized";
     downloaded_profile_image_ = logged_in_user_->image();
     downloaded_profile_image_data_url_ =
-        web_ui_util::GetImageDataUrl(gfx::ImageSkia(downloaded_profile_image_));
+        web_ui_util::GetImageDataUrl(downloaded_profile_image_);
     profile_image_url_ = logged_in_user_->image_url();
   }
 }
 
 void UserManagerImpl::DownloadProfileData(const std::string& reason,
                                           bool download_image) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // For guest login there's no profile image to download.
   if (IsLoggedInAsGuest())
@@ skipping 124 matching lines @@
     return;
 
   // Check if this image is not the same as already downloaded.
   gfx::ImageSkia new_image(downloader->GetProfilePicture());
   std::string new_image_data_url = web_ui_util::GetImageDataUrl(new_image);
   if (!downloaded_profile_image_data_url_.empty() &&
       new_image_data_url == downloaded_profile_image_data_url_)
     return;
 
   downloaded_profile_image_data_url_ = new_image_data_url;
-  downloaded_profile_image_ = downloader->GetProfilePicture();
+  downloaded_profile_image_ = gfx::ImageSkia(downloader->GetProfilePicture());
   profile_image_url_ = GURL(downloader->GetProfilePictureURL());
 
   if (GetLoggedInUser().image_index() == User::kProfileImageIndex) {
     VLOG(1) << "Updating profile image for logged-in user";
     UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
                               kDownloadSuccessChanged,
                               kDownloadResultsCount);
     // This will persist |downloaded_profile_image_| to file.
     SaveUserImageFromProfileImage(GetLoggedInUser().email());
   }
 
-  // TODO(ivankr): temporary measure until UserManager is fully migrated
-  // to use ImageSkia instead of SkBitmap.
-  gfx::ImageSkia profile_image(downloaded_profile_image_);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
       content::Source<UserManagerImpl>(this),
-      content::Details<const gfx::ImageSkia>(&profile_image));
+      content::Details<const gfx::ImageSkia>(&downloaded_profile_image_));
 }
 
 void UserManagerImpl::OnProfileDownloadFailure(ProfileDownloader* downloader) {
   DCHECK_EQ(downloader, profile_image_downloader_.get());
   profile_image_downloader_.reset();
 
   downloading_profile_image_ = false;
 
   UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
       kDownloadFailure, kDownloadResultsCount);
@@ skipping 84 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos