Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ash/shell/content_client/shell_content_browser_client.cc

Index: ash/shell/content_client/shell_content_browser_client.cc
diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc
index 137e0a8fa2b489c466c344818237072043c6ef1b..f2f3c60f325056eb9e290eb584999c40ef5d0e19 100644
--- a/ash/shell/content_client/shell_content_browser_client.cc
+++ b/ash/shell/content_client/shell_content_browser_client.cc
@@ -14,7 +14,7 @@
 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 namespace shell {
@@ -124,8 +124,8 @@ std::string ShellContentBrowserClient::GetAcceptLangs(
   return std::string();
 }
 
-SkBitmap* ShellContentBrowserClient::GetDefaultFavicon() {
-  static SkBitmap empty;
+gfx::ImageSkia* ShellContentBrowserClient::GetDefaultFavicon() {
+  static gfx::ImageSkia empty;

[sky, 2012/05/29 17:18:26]

This should be a static gfx::ImageSkia*

   return ∅
 }