Switch CoreTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/core_tab_helper_delegate.h

Index: chrome/browser/ui/tab_contents/core_tab_helper_delegate.h
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper_delegate.h b/chrome/browser/ui/tab_contents/core_tab_helper_delegate.h
index 3397f3d7920988c92c2b9ca509e6808fbfe42d4b..e06abb29ab39dd6e1baec96ffddfdf6ca51526df 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper_delegate.h
+++ b/chrome/browser/ui/tab_contents/core_tab_helper_delegate.h
@@ -7,26 +7,29 @@
 
 #include "base/basictypes.h"
 
-class TabContents;
+namespace content {
+class WebContents;
+}
 
-// Objects implement this interface to get notified about changes in the
-// TabContents and to provide necessary functionality.
+// Objects implement this interface to get notified about changes in a
+// WebContents and to provide necessary functionality.
 //
-// This is considered part of the TabContents "core" interface. If a piece of
-// code interacts with TabContent, it is guaranteed that it will need to handle
-// all of these callbacks.
+// This is the catch-all interface for holding additions to WebContents that are
+// needed when a WebContents is promoted to being a tab contents, but that
+// don't cleanly fit elsewhere.
 class CoreTabHelperDelegate {
  public:
-  virtual void SwapTabContents(TabContents* old_tc,
-                               TabContents* new_tc);
+  // The caller is responsible for deleting |old_contents|.
+  virtual void SwapTabContents(content::WebContents* old_contents,
+                               content::WebContents* new_contents);
 
-  // Whether the specified TabContent can be reloaded.
-  // Reloading can be disabled e. g. for the DevTools window.
-  virtual bool CanReloadContents(TabContents* source) const;
+  // Whether the specified WebContents can be reloaded.
+  // Reloading can be disabled e.g. for the DevTools window.
+  virtual bool CanReloadContents(content::WebContents* web_contents) const;
 
-  // Whether the specified TabContent can be saved.
-  // Saving can be disabled e. g. for the DevTools window.
-  virtual bool CanSaveContents(TabContents* source) const;
+  // Whether the specified WebContents can be saved.
+  // Saving can be disabled e.g. for the DevTools window.
+  virtual bool CanSaveContents(content::WebContents* web_contents) const;
 
  protected:
   virtual ~CoreTabHelperDelegate();