Remove ImageSkia::empty and ImageSkia::extractSubset

chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.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/ui/webui/options/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 267 matching lines @@
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
                                    data_url, select);
 }
 
 void ChangePictureOptionsHandler::UpdateProfileImage() {
   UserManager* user_manager = UserManager::Get();
 
   // If we have a downloaded profile image and haven't sent it in
   // |SendSelectedImage|, send it now (without selecting).
   if (previous_image_index_ != User::kProfileImageIndex &&
-      !user_manager->DownloadedProfileImage().empty())
+      !user_manager->DownloadedProfileImage().isNull())
     SendProfileImage(user_manager->DownloadedProfileImage(), false);
 
   user_manager->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
   std::string image_url;
   if (!args ||
       args->GetSize() != 1 ||
       !args->GetString(0, &image_url)) {
     NOTREACHED();
     return;
   }
   DCHECK(!image_url.empty());
 
   UserManager* user_manager = UserManager::Get();
   const User& user = user_manager->GetLoggedInUser();
   int image_index = User::kInvalidImageIndex;
   bool waiting_for_camera_photo = false;
 
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
     // Image from file/camera uses |kChromeUIUserImageURL| as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
     // Also, old (not available for selection any more) default images use
     // this URL, too.
 
     if (previous_image_index_ == User::kExternalImageIndex) {
-      DCHECK(!previous_image_.empty());
+      DCHECK(!previous_image_.isNull());
       user_manager->SaveUserImage(user.email(),
                                   UserImage::CreateAndEncode(previous_image_));
     } else {
       DCHECK(previous_image_index_ >= 0 &&
              previous_image_index_ < kFirstDefaultImageIndex);
       user_manager->SaveUserDefaultImageIndex(user.email(),
                                               previous_image_index_);
     }
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                               kHistogramImageOld,
                               kHistogramImagesCount);
     VLOG(1) << "Selected old user image";
   } else if (IsDefaultImageUrl(image_url, &image_index)) {
     // One of the default user images.
     user_manager->SaveUserDefaultImageIndex(user.email(), image_index);
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                               GetDefaultImageHistogramValue(image_index),
                               kHistogramImagesCount);
     VLOG(1) << "Selected default user image: " << image_index;
   } else if (image_url == user_photo_data_url_) {
     // Camera image is selected.
-    if (user_photo_.empty()) {
+    if (user_photo_.isNull()) {
       DCHECK(image_decoder_.get());
       waiting_for_camera_photo = true;
       VLOG(1) << "Still waiting for camera image to decode";
     } else {
       OnPhotoAccepted(user_photo_);
     }
   } else {
     // Profile image selected. Could be previous (old) user image.
     user_manager->SaveUserImageFromProfileImage(user.email());
 
@@ skipping 88 matching lines @@
   OnPhotoAccepted(user_photo_);
 }
 
 void ChangePictureOptionsHandler::OnDecodeImageFailed(
     const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace options
 }  // namespace chromeos