Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index daffdc378be00d603ae285b97a9bf9b89e2e390a..8254e5134b47ce5b74cdc40de127b47572b5065f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -554,13 +554,12 @@ bool Browser::is_devtools() const {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, State Storage and Retrieval for UI:
 
-SkBitmap Browser::GetCurrentPageIcon() const {
+gfx::Image Browser::GetCurrentPageIcon() const {
   TabContents* contents = chrome::GetActiveTabContents(this);
   // |contents| can be NULL since GetCurrentPageIcon() is called by the window
   // during the window's creation (before tabs have been added).
-  // TODO: Let this return a gfx::Image.
   return contents ?
-      contents->favicon_tab_helper()->GetFavicon().AsBitmap() : SkBitmap();
+      contents->favicon_tab_helper()->GetFavicon() : gfx::Image();
 }
 
 string16 Browser::GetWindowTitleForCurrentTab() const {