Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 2475bb2a6b001fc07f8393d4495d262e5a7951a9..7b285ff098f930da6c6feb7281bb4e1db7007916 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -54,7 +54,6 @@ class FindBarController;
 class FullscreenController;
 class PrefService;
 class Profile;
-class SkBitmap;
 class StatusBubble;
 class TabNavigation;
 class TabStripModel;
@@ -82,6 +81,7 @@ class WindowController;
 }
 
 namespace gfx {
+class Image;
 class Point;
 }
 
@@ -281,7 +281,7 @@ class Browser : public TabStripModelObserver,
   // State Storage and Retrieval for UI ///////////////////////////////////////
 
   // Gets the Favicon of the page in the selected tab.
-  SkBitmap GetCurrentPageIcon() const;
+  gfx::Image GetCurrentPageIcon() const;
 
   // Gets the title of the window based on the selected tab's title.
   string16 GetWindowTitleForCurrentTab() const;