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

ash/shell/content_client/shell_content_browser_client.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 "ash/shell/content_client/shell_content_browser_client.h"
 
 #include "ash/shell/content_client/shell_browser_main_parts.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_render_view_host_observer.h"
 #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 {
 
 ShellContentBrowserClient::ShellContentBrowserClient()
     : shell_browser_main_parts_(NULL) {
 }
 
 ShellContentBrowserClient::~ShellContentBrowserClient() {
 }
@@ skipping 89 matching lines @@
 
 std::string ShellContentBrowserClient::GetApplicationLocale() {
   return std::string();
 }
 
 std::string ShellContentBrowserClient::GetAcceptLangs(
     content::BrowserContext* context) {
   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 ∅
 }
 
 bool ShellContentBrowserClient::AllowAppCache(
     const GURL& manifest_url,
     const GURL& first_party,
     content::ResourceContext* context) {
   return true;
 }
 
@@ skipping 233 matching lines @@
   return NULL;
 }
 #endif
 
 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 }  // namespace examples
 }  // namespace views