Switch WebIntentPickerController to use WebContentsUserData.

chrome/browser/ui/views/location_bar/web_intents_button_view.cc

Index: chrome/browser/ui/views/location_bar/web_intents_button_view.cc
diff --git a/chrome/browser/ui/views/location_bar/web_intents_button_view.cc b/chrome/browser/ui/views/location_bar/web_intents_button_view.cc
index 88fa270f15eadd6f6464b22ddf8c0c21427ba6f1..056620a55f547d85a9c1d884c7a27d2a3365960e 100644
--- a/chrome/browser/ui/views/location_bar/web_intents_button_view.cc
+++ b/chrome/browser/ui/views/location_bar/web_intents_button_view.cc
@@ -23,10 +23,12 @@ WebIntentsButtonView::WebIntentsButtonView(LocationBarView* parent,
 }
 
 void WebIntentsButtonView::Update(TabContents* tab_contents) {
-  if (!tab_contents ||
-      !tab_contents->web_intent_picker_controller() ||
-      !tab_contents->web_intent_picker_controller()->
-          ShowLocationBarPickerTool()) {
+  WebIntentPickerController* web_intent_picker_controller =
+      tab_contents ? WebIntentPickerController::FromWebContents(
+                         tab_contents->web_contents())
+                   : NULL;
+  if (!web_intent_picker_controller ||
+      !web_intent_picker_controller->ShowLocationBarPickerTool()) {
     SetVisible(false);
     return;
   }
@@ -47,7 +49,8 @@ void WebIntentsButtonView::OnClick(LocationBarView* parent) {
   if (!tab_contents)
     return;
 
-  tab_contents->web_intent_picker_controller()->LocationBarPickerToolClicked();
+  WebIntentPickerController::FromWebContents(tab_contents->web_contents())->
+      LocationBarPickerToolClicked();
 }
 
 int WebIntentsButtonView::GetTextAnimationSize(double state, int text_size) {