Change return type of FaviconTabHelper::GetFavicon() to gfx::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 aab0c3209e3f5d4290782e47fe131433d3f5174e..bc5a5399a79027686c22782ffe30885ec3f4a7fb 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1074,7 +1074,8 @@ void LocationBarView::OnSetFocus() {
 }
 
 SkBitmap LocationBarView::GetFavicon() const {
-  return delegate_->GetTabContents()->favicon_tab_helper()->GetFavicon();
+  return delegate_->GetTabContents()->favicon_tab_helper()->
+             GetFavicon().AsBitmap();
 }
 
 string16 LocationBarView::GetTitle() const {
@@ -1305,10 +1306,12 @@ void LocationBarView::WriteDragDataForView(views::View* sender,
 
   TabContents* tab_contents = delegate_->GetTabContents();
   DCHECK(tab_contents);
+  gfx::ImageSkia favicon =
+      tab_contents->favicon_tab_helper()->GetFavicon().AsImageSkia();
   button_drag_utils::SetURLAndDragImage(
       tab_contents->web_contents()->GetURL(),
       tab_contents->web_contents()->GetTitle(),
-      tab_contents->favicon_tab_helper()->GetFavicon(),
+      favicon,
       data,
       sender->GetWidget());
 }