Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
index 61c8fc10f46f3df58b6bd3dbc508bc39ef9b418b..405019b6bca95acf2123a4219872504e580f03b4 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
@@ -14,10 +14,9 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
-#include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/image/image.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
@@ -65,9 +64,8 @@ NSPasteboard* LocationIconDecoration::GetDragPasteboard() {
 }
 
 NSImage* LocationIconDecoration::GetDragImage() {
-  const SkBitmap& favicon = owner_->GetFavicon();
-  NSImage* iconImage = (!favicon.isNull()) ?
-      gfx::SkBitmapToNSImage(favicon) : GetImage();
+  NSImage* favicon = owner_->GetFavicon().ToNSImage();

[Nico, 2012/08/16 20:26:27]

This will crash if GetFavicon() IsEmpty(). (You can use AsNSImage(), I'll clean
that up later.)

+  NSImage* iconImage = favicon ? favicon : GetImage();
 
   NSImage* image = bookmark_pasteboard_helper_mac::DragImageForBookmark(
       iconImage, owner_->GetTitle());