Convert most of the rest of chrome to ImageSkia

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/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 35 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia.h"
 
 using content::BrowserThread;
 
 typedef GoogleServiceAuthError AuthError;
 
 namespace chromeos {
 
 namespace {
 
 // Incognito user is represented by an empty string (since some code already
@@ skipping 1209 matching lines @@
   }
   return true;
 }
 
 void UserManagerImpl::InitDownloadedProfileImage() {
   DCHECK(logged_in_user_);
   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(downloaded_profile_image_);
+        web_ui_util::GetImageDataUrl(gfx::ImageSkia(downloaded_profile_image_));
   }
 }
 
 void UserManagerImpl::DeleteUserImage(const FilePath& image_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!file_util::Delete(image_path, false)) {
     LOG(ERROR) << "Failed to remove user image.";
     return;
   }
 }
@@ skipping 59 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
       result, kDownloadResultsCount);
 
   DCHECK(!profile_image_load_start_time_.is_null());
   base::TimeDelta delta = base::Time::Now() - profile_image_load_start_time_;
   AddProfileImageTimeHistogram(result, profile_image_download_reason_, delta);
 
   if (result == kDownloadSuccess) {
     // Check if this image is not the same as already downloaded.
     std::string new_image_data_url =
-        web_ui_util::GetImageDataUrl(downloader->GetProfilePicture());
+        web_ui_util::GetImageDataUrl(gfx::ImageSkia(
+        downloader->GetProfilePicture()));
     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();
 
     if (GetLoggedInUser().image_index() == User::kProfileImageIndex) {
       VLOG(1) << "Updating profile image for logged-in user";
       UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
@@ skipping 89 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos