Change return type of FaviconTabHelper::GetFavicon() to gfx::Image.

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/stl_util.h"
@@ skipping 1056 matching lines @@
 void LocationBarView::OnSetFocus() {
   views::FocusManager* focus_manager = GetFocusManager();
   if (!focus_manager) {
     NOTREACHED();
     return;
   }
   focus_manager->SetFocusedView(view_to_focus_);
 }
 
 SkBitmap LocationBarView::GetFavicon() const {
-  return delegate_->GetTabContents()->favicon_tab_helper()->GetFavicon();
+  return delegate_->GetTabContents()->favicon_tab_helper()->
+             GetFavicon().AsBitmap();
 }
 
 string16 LocationBarView::GetTitle() const {
   return GetWebContentsFromDelegate(delegate_)->GetTitle();
 }
 
 InstantController* LocationBarView::GetInstant() {
   return delegate_->GetInstant();
 }
 
@@ skipping 210 matching lines @@
 }
 
 void LocationBarView::WriteDragDataForView(views::View* sender,
                                            const gfx::Point& press_pt,
                                            OSExchangeData* data) {
   DCHECK_NE(GetDragOperationsForView(sender, press_pt),
             ui::DragDropTypes::DRAG_NONE);
 
   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());
 }
 
 int LocationBarView::GetDragOperationsForView(views::View* sender,
                                               const gfx::Point& p) {
   DCHECK((sender == location_icon_view_) || (sender == ev_bubble_view_));
   WebContents* web_contents = GetWebContentsFromDelegate(delegate_);
   return (web_contents && web_contents->GetURL().is_valid() &&
           !GetLocationEntry()->IsEditingOrEmpty()) ?
@@ skipping 204 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA