Switch WebIntentPickerController to use 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 322 matching lines @@
  private:
   // PageToolViewGtk
   virtual GdkColor button_border_color() const OVERRIDE;
   virtual GdkColor gradient_top_color() const OVERRIDE;
   virtual GdkColor gradient_bottom_color() const OVERRIDE;
   virtual void OnClick(GtkWidget* sender) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentsButtonViewGtk);
 };
 
-void WebIntentsButtonViewGtk::Update(
-    TabContents* tab_contents) {
-  if (!tab_contents ||
-      !tab_contents->web_intent_picker_controller() ||
-      !tab_contents->web_intent_picker_controller()->
-           ShowLocationBarPickerTool()) {
+void WebIntentsButtonViewGtk::Update(TabContents* tab_contents) {
+  WebIntentPickerController* web_intent_picker_controller =
+      tab_contents ? WebIntentPickerController::FromWebContents(
+                         tab_contents->web_contents())
+                   : NULL;
+  if (!web_intent_picker_controller ||
+      !web_intent_picker_controller->ShowLocationBarPickerTool()) {
     gtk_widget_hide(widget());
     return;
   }
 
   gtk_widget_set_tooltip_text(widget(),
       l10n_util::GetStringUTF8(IDS_INTENT_PICKER_USE_ANOTHER_SERVICE).c_str());
   gtk_widget_show_all(widget());
 
   gtk_label_set_text(GTK_LABEL(label_.get()),
       l10n_util::GetStringUTF8(IDS_INTENT_PICKER_USE_ANOTHER_SERVICE).c_str());
 
   StartAnimating();
 }
 
 void WebIntentsButtonViewGtk::OnClick(GtkWidget* sender) {
   TabContents* tab_contents = parent_->GetTabContents();
   if (!tab_contents)
     return;
 
-  tab_contents->web_intent_picker_controller()->LocationBarPickerToolClicked();
+  WebIntentPickerController::FromWebContents(tab_contents->web_contents())->
+      LocationBarPickerToolClicked();
 }
 
 GdkColor WebIntentsButtonViewGtk::button_border_color() const {
   return kGrayBorderColor;
 }
 
 GdkColor WebIntentsButtonViewGtk::gradient_top_color() const {
   return kTopColorGray;
 }
 
@@ skipping 1757 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }