Switch CoreTabHelper to use WebContentsUserData.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1088 matching lines @@
   // Update commands to reflect current state.
   command_controller_->TabStateChanged();
 
   // Reset the status bubble.
   StatusBubble* status_bubble = GetStatusBubble();
   if (status_bubble) {
     status_bubble->Hide();
 
     // Show the loading state (if any).
     status_bubble->SetStatus(
-        chrome::GetActiveTabContents(this)->core_tab_helper()->GetStatusText());
+        CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
+            GetStatusText());
   }
 
   if (HasFindBarController()) {
     find_bar_controller_->ChangeTabContents(new_contents);
     find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
   }
 
   // Update sessions. Don't force creation of sessions. If sessions doesn't
   // exist, the change will be picked up by sessions when created.
   SessionService* session_service =
@@ skipping 194 matching lines @@
 void Browser::LoadingStateChanged(WebContents* source) {
   window_->UpdateLoadingAnimations(tab_strip_model_->TabsAreLoading());
   window_->UpdateTitleBar();
 
   WebContents* selected_contents = chrome::GetActiveWebContents(this);
   if (source == selected_contents) {
     bool is_loading = source->IsLoading();
     command_controller_->LoadingStateChanged(is_loading, false);
     if (GetStatusBubble()) {
       GetStatusBubble()->SetStatus(
-          chrome::GetActiveTabContents(this)->core_tab_helper()->
+          CoreTabHelper::FromWebContents(chrome::GetActiveWebContents(this))->
               GetStatusText());
     }
   }
 }
 
 void Browser::CloseContents(WebContents* source) {
   if (unload_controller_->CanCloseContents(source))
     chrome::CloseWebContents(this, source);
 }
 
@@ skipping 360 matching lines @@
 void Browser::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest* request,
     const content::MediaResponseCallback& callback) {
   RequestMediaAccessPermissionHelper(web_contents, request, callback);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, SearchEngineTabHelperDelegate implementation:
 
 void Browser::ConfirmAddSearchProvider(TemplateURL* template_url,
                                        Profile* profile) {
   window()->ConfirmAddSearchProvider(template_url, profile);
 }
@@ skipping 272 matching lines @@
     if (contents == chrome::GetActiveWebContents(this)) {
       // Updates that only matter when the tab is selected go here.
 
       if (flags & content::INVALIDATE_TYPE_PAGE_ACTIONS) {
         LocationBar* location_bar = window()->GetLocationBar();
         if (location_bar)
           location_bar->UpdatePageActions();
       }
       // 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 |
                    content::INVALIDATE_TYPE_TITLE)) {
         window_->UpdateTitleBar();
       }
     }
 
     // Updates that don't depend upon the selected state go here.
     if (flags &
@@ skipping 261 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }