Switch CoreTabHelper to use WebContentsUserData.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 7f10f61853dd71c68498b3106202b44f83af2ed6..183cae04932aa9a80b8b466a4e722462b3e879c4 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1106,7 +1106,8 @@ void Browser::ActiveTabChanged(TabContents* old_contents,
 
     // Show the loading state (if any).
     status_bubble->SetStatus(
-        chrome::GetActiveTabContents(this)->core_tab_helper()->GetStatusText());
+        CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
+            GetStatusText());
   }
 
   if (HasFindBarController()) {
@@ -1321,7 +1322,7 @@ void Browser::LoadingStateChanged(WebContents* source) {
     command_controller_->LoadingStateChanged(is_loading, false);
     if (GetStatusBubble()) {
       GetStatusBubble()->SetStatus(
-          chrome::GetActiveTabContents(this)->core_tab_helper()->
+          CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
               GetStatusText());
     }
   }
@@ -1702,18 +1703,19 @@ void Browser::RequestMediaAccessPermission(
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, CoreTabHelperDelegate implementation:
 
-void Browser::SwapTabContents(TabContents* old_tab_contents,
-                              TabContents* new_tab_contents) {
-  int index = tab_strip_model_->GetIndexOfTabContents(old_tab_contents);
+void Browser::SwapTabContents(content::WebContents* old_contents,
+                              content::WebContents* new_contents) {
+  int index = tab_strip_model_->GetIndexOfWebContents(old_contents);
   DCHECK_NE(TabStripModel::kNoTab, index);
+  TabContents* new_tab_contents = TabContents::FromWebContents(new_contents);
   tab_strip_model_->ReplaceTabContentsAt(index, new_tab_contents);
 }
 
-bool Browser::CanReloadContents(TabContents* source) const {
+bool Browser::CanReloadContents(content::WebContents* web_contents) const {
   return chrome::CanReload(this);
 }
 
-bool Browser::CanSaveContents(TabContents* source) const {
+bool Browser::CanSaveContents(content::WebContents* web_contents) const {
   return chrome::CanSavePage(this);
 }
 
@@ -2006,8 +2008,9 @@ void Browser::ProcessPendingUIUpdates() {
       }
       // Updating the URL happens synchronously in ScheduleUIUpdate.
       if (flags & content::INVALIDATE_TYPE_LOAD && GetStatusBubble()) {
-        GetStatusBubble()->SetStatus(chrome::GetActiveTabContents(this)->
-            core_tab_helper()->GetStatusText());
+        GetStatusBubble()->SetStatus(
+            CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
+                GetStatusText());
       }
 
       if (flags & (content::INVALIDATE_TYPE_TAB |