Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index c51c9c2ca95e94e2e75324a63e4592bc7b729ee7..bf19c35a76ad3575cfd6f020ab918e929fde764a 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -478,8 +478,9 @@ void ContentSettingPopupBubbleModel::SetPopups() {
     popup_item.title = title;
     // TODO: Make this use gfx::Image.
     TabContents* tab_contents = TabContents::FromWebContents(*i);

[stevenjb, 2012/10/01 17:56:51]

nit: Move this above where it's needed (or eliminate the local variable
entirely)

[Avi (use Gerrit), 2012/10/01 19:23:57]

Done.

-    popup_item.bitmap =
-        tab_contents->favicon_tab_helper()->GetFavicon().AsBitmap();
+    const FaviconTabHelper* favicon_tab_helper =
+        FaviconTabHelper::FromWebContents(*i);

[stevenjb, 2012/10/01 17:56:51]

nit: Don't really need a local here either.

[Avi (use Gerrit), 2012/10/01 19:23:57]

Done.

+    popup_item.bitmap = favicon_tab_helper->GetFavicon().AsBitmap();
     popup_item.tab_contents = tab_contents;
     add_popup(popup_item);
   }