Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 0bbcb84135bdfc9945bad72d45e52f4858ea13f8..3e64377c78a110e493ebbc01954cfaf62f3291d6 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1048,9 +1048,9 @@ void LocationBarView::OnSetFocus() {
   focus_manager->SetFocusedView(view_to_focus_);
 }
 
-SkBitmap LocationBarView::GetFavicon() const {
+gfx::Image LocationBarView::GetFavicon() const {
   return delegate_->GetTabContents()->favicon_tab_helper()->
-             GetFavicon().AsBitmap();
+             GetFavicon();
 }
 
 string16 LocationBarView::GetTitle() const {