Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 1133 matching lines @@
   // Remember the previous visibility of the page actions so that we can
   // notify when this changes.
   std::map<ExtensionAction*, bool> old_visibility;
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
   }
 
   std::vector<ExtensionAction*> new_page_actions;
 
-  TabContents* tab_contents = GetTabContents();
-  if (tab_contents) {
+  WebContents* contents = GetWebContentsFromDelegate(delegate_);
+  if (contents) {
+    extensions::TabHelper* extensions_tab_helper =
+        extensions::TabHelper::FromWebContents(contents);
     extensions::LocationBarController* controller =
-        tab_contents->extension_tab_helper()->location_bar_controller();
+        extensions_tab_helper->location_bar_controller();
     new_page_actions = controller->GetCurrentActions();
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions_ != new_page_actions) {
     page_actions_.swap(new_page_actions);
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_views_.resize(page_actions_.size());
     View* right_anchor = star_view_;
     if (!right_anchor)
       right_anchor = action_box_button_view_;
     DCHECK(right_anchor);
 
     // Add the page actions in reverse order, so that the child views are
     // inserted in left-to-right order for accessibility.
     for (int i = page_actions_.size() - 1; i >= 0; --i) {
       page_action_views_[i] = new PageActionWithBadgeView(
           delegate_->CreatePageActionImageView(this, page_actions_[i]));
       page_action_views_[i]->SetVisible(false);
       AddChildViewAt(page_action_views_[i], GetIndexOf(right_anchor));
     }
   }
 
-  WebContents* contents = GetWebContentsFromDelegate(delegate_);
   if (!page_action_views_.empty() && contents) {
     Browser* browser = browser::FindBrowserWithWebContents(contents);
     GURL url = chrome::GetActiveWebContents(browser)->GetURL();
 
     for (PageActionViews::const_iterator i(page_action_views_.begin());
          i != page_action_views_.end(); ++i) {
       (*i)->UpdateVisibility(model_->input_in_progress() ? NULL : contents,
                              url);
 
       // Check if the visibility of the action changed and notify if it did.
@@ skipping 339 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA