Remove ImageSkia::empty and ImageSkia::extractSubset

chrome/browser/ui/webui/options/chromeos/wallpaper_source.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/wallpaper_source.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/debug/trace_event.h"
 #include "base/synchronization/cancellation_flag.h"
@@ skipping 115 matching lines @@
 // Get current background image and store it to |data|.
 void WallpaperImageSource::GetCurrentUserWallpaper(int request_id) {
   SkBitmap image;
   TRACE_EVENT0("LOCK_SCREEN", "GetCurrentUserWallpaper");
   if (chromeos::UserManager::Get()->IsUserLoggedIn()) {
     // TODO(sad|bshe): It maybe necessary to include the scale factor in the
     // request (as is done for user-image and wallpaper-thumbnails).
     SkBitmap wallpaper;
     gfx::ImageSkia wallpaper_skia = ash::Shell::GetInstance()->
         desktop_background_controller()->GetCurrentWallpaperImage();
-    if (!wallpaper_skia.empty())
+    if (!wallpaper_skia.isNull())
       wallpaper = *wallpaper_skia.bitmap();
     SkBitmap copy;
     if (wallpaper.deepCopyTo(&copy, wallpaper.config()))
       image = copy;
   }
   content::BrowserThread::PostTask(
     content::BrowserThread::IO,
     FROM_HERE,
     base::Bind(&WallpaperImageSource::ImageAcquired, this, image, request_id));
 }
@@ skipping 31 matching lines @@
 
 void WallpaperImageSource::SendCurrentUserWallpaper(int request_id,
     scoped_refptr<base::RefCountedBytes> data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   SendResponse(request_id, data);
   TRACE_EVENT_ASYNC_END0("SCREEN_LOCK", "GetUserWallpaper", request_id);
 }
 
 }  // namespace options
 }  // namespace chromeos