Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/panels/panel_host.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/panels/panel_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_page_zoom.h"
@@ skipping 45 matching lines @@
   chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_PANEL);
   web_contents_->SetDelegate(this);
   content::WebContentsObserver::Observe(web_contents_.get());
 
   // Needed to give the web contents a Tab ID. Extension APIs
   // expect web contents to have a Tab ID.
   SessionTabHelper::CreateForWebContents(web_contents_.get());
   SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID(
       panel_->session_id());
 
-  favicon_tab_helper_.reset(new FaviconTabHelper(web_contents_.get()));
+  FaviconTabHelper::CreateForWebContents(web_contents_.get());
   prefs_tab_helper_.reset(new PrefsTabHelper(web_contents_.get()));
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
 }
 
 void PanelHost::DestroyWebContents() {
-  favicon_tab_helper_.reset();
   prefs_tab_helper_.reset();
   web_contents_.reset();
 }
 
 gfx::Image PanelHost::GetPageIcon() const {
-  return favicon_tab_helper_.get() ?
-      favicon_tab_helper_->GetFavicon() : gfx::Image();
+  if (!web_contents_.get())
+    return gfx::Image();
+
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(web_contents_.get());
+  return favicon_tab_helper->GetFavicon();
 }
 
 content::WebContents* PanelHost::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   // These dispositions aren't really navigations.
   if (params.disposition == SUPPRESS_OPEN ||
       params.disposition == SAVE_TO_DISK ||
       params.disposition == IGNORE_ACTION)
     return NULL;
@@ skipping 157 matching lines @@
 }
 
 void PanelHost::StopLoading() {
   content::RecordAction(UserMetricsAction("Stop"));
   web_contents_->Stop();
 }
 
 void PanelHost::Zoom(content::PageZoom zoom) {
   chrome_page_zoom::Zoom(web_contents_.get(), zoom);
 }