Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 938 matching lines @@
   }
 
   // If there are no visible content things, hide the top level box so it
   // doesn't mess with padding.
   gtk_widget_set_visible(content_setting_hbox_.get(), any_visible);
 }
 
 void LocationBarViewGtk::UpdatePageActions() {
   std::vector<ExtensionAction*> new_page_actions;
 
-  TabContents* tab_contents = GetTabContents();
-  if (tab_contents) {
+  WebContents* contents = GetWebContents();
+  if (contents) {
     LocationBarController* location_bar_controller =
-        tab_contents->extension_tab_helper()->location_bar_controller();
+        extensions::TabHelper::FromWebContents(contents)->
+            location_bar_controller();
     new_page_actions = location_bar_controller->GetCurrentActions();
   }
 
   // Initialize on the first call, or re-initialize if more extensions have been
   // loaded or added after startup.
   if (new_page_actions != page_actions_) {
     page_actions_.swap(new_page_actions);
     page_action_views_.clear();
 
     for (size_t i = 0; i < page_actions_.size(); ++i) {
       page_action_views_.push_back(
           new PageActionViewGtk(this, page_actions_[i]));
       gtk_box_pack_end(GTK_BOX(page_action_hbox_.get()),
                        page_action_views_[i]->widget(), FALSE, FALSE, 0);
     }
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
         content::Source<LocationBar>(this),
         content::NotificationService::NoDetails());
   }
 
-  WebContents* contents = GetWebContents();
   if (!page_action_views_.empty() && contents) {
     GURL url = chrome::GetActiveWebContents(browser())->GetURL();
 
     for (size_t i = 0; i < page_action_views_.size(); i++) {
       page_action_views_[i]->UpdateVisibility(
           toolbar_model_->input_in_progress() ? NULL : contents, url);
     }
   }
 
   // If there are no visible page actions, hide the hbox too, so that it does
@@ skipping 1034 matching lines @@
       owner_->browser()->profile()->GetExtensionService();
   if (!extension_service)
     return TRUE;
 
   const Extension* extension =
       extension_service->extensions()->GetByID(page_action()->extension_id());
   if (!extension)
     return TRUE;
 
   LocationBarController* controller =
-      tab_contents->extension_tab_helper()->location_bar_controller();
+      extensions::TabHelper::FromWebContents(tab_contents->web_contents())->
+          location_bar_controller();
 
   switch (controller->OnClicked(extension->id(), event->button)) {
     case LocationBarController::ACTION_NONE:
       break;
 
     case LocationBarController::ACTION_SHOW_POPUP:
       ExtensionPopupGtk::Show(
           page_action_->GetPopupUrl(current_tab_id_),
           owner_->browser_,
           event_box_.get(),
@@ skipping 64 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }