Remove ImageSkia::empty and ImageSkia::extractSubset

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 543 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   image_loader_->Start(
       path.value(), login::kMaxUserImageSize,
       base::Bind(&UserManagerImpl::SaveUserImage,
                  base::Unretained(this), username));
 }
 
 void UserManagerImpl::SaveUserImageFromProfileImage(
     const std::string& username) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!downloaded_profile_image_.empty()) {
+  if (!downloaded_profile_image_.isNull()) {
     // Profile image has already been downloaded, so save it to file right now.
     DCHECK(profile_image_url_.is_valid());
     SaveUserImageInternal(
         username,
         User::kProfileImageIndex, profile_image_url_,
         UserImage::CreateAndEncode(downloaded_profile_image_));
   } else {
     // No profile image - use the stub image (gray avatar).
     SetUserImage(username, User::kProfileImageIndex, GURL(), UserImage());
     SaveImageToLocalState(username, "", User::kProfileImageIndex,
@@ skipping 392 matching lines @@
                                    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
     // them from Local State.
     DCHECK(user->image_index() != User::kInvalidImageIndex ||
            is_current_user_new_);
     bool image_changed = user->image_index() != User::kInvalidImageIndex;
-    if (!user_image.image().empty())
+    if (!user_image.image().isNull())
       user->SetImage(user_image, image_index);
     else
       user->SetStubImage(image_index);
     user->SetImageURL(image_url);
     // For the logged-in user with a profile picture, initialize
     // |downloaded_profile_picture_|.
     if (user == logged_in_user_ && image_index == User::kProfileImageIndex)
       InitDownloadedProfileImage();
     if (image_changed) {
       // Unless this is first-time setting with |SetInitialUserImage|,
@@ skipping 116 matching lines @@
                            encoded_image->size()) == -1) {
     LOG(ERROR) << "Failed to save image to file.";
     return false;
   }
   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()) {
+  if (downloaded_profile_image_.isNull() && !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_);
     profile_image_url_ = logged_in_user_->image_url();
   }
 }
 
 void UserManagerImpl::DownloadProfileData(const std::string& reason,
                                           bool download_image) {
@@ skipping 248 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos