Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm

 // 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/cocoa/tab_contents/favicon_util_mac.h"
 
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace mac {
 
 NSImage* FaviconForTabContents(TabContents* contents) {
-  if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {
-    NSImage* image = contents->favicon_tab_helper()->GetFavicon().AsNSImage();
+  FaviconTabHelper* favicon_tab_helper =
+      contents ? FaviconTabHelper::FromWebContents(contents->web_contents())

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

This seems like a common enough pattern that it would make sense to have a
::FromTabContents. Or would that be difficult/awkward?

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

I'm on a quest to kill TabContents (see the bug linked from this CL). Adding any
more use of TabContents would be counterproductive.

[stevenjb, 2012/10/01 19:31:46]

Fair enough.

+               : NULL;
+  if (favicon_tab_helper && favicon_tab_helper->FaviconIsValid()) {
+    NSImage* image = favicon_tab_helper->GetFavicon().AsNSImage();
     // The |image| could be nil if the bitmap is null. In that case, fallback
     // to the default image.
     if (image) {
       return image;
     }
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
 }
 
 }  // namespace mac