Switch WebIntentPickerController to use WebContentsUserData.

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 223 matching lines @@
     // created for a URL it doesn't know and there is no default factory.
     // Instead, use this dummy factory to infinitely delay the request.
     default_url_fetcher_factory_.reset(new DummyURLFetcherFactory);
     fake_url_fetcher_factory_.reset(
         new net::FakeURLFetcherFactory(default_url_fetcher_factory_.get()));
 
     web_data_service_ = WebDataServiceFactory::GetForProfile(
         GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);
     favicon_service_ = FaviconServiceFactory::GetForProfile(
         GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);
-    controller_ = chrome::GetActiveTabContents(GetBrowser())->
-        web_intent_picker_controller();
+    controller_ = WebIntentPickerController::FromWebContents(
+        chrome::GetActiveWebContents(GetBrowser()));
 
     SetupMockPicker();
     controller_->set_model_observer(&picker_);
     picker_.delegate_ = controller_;
 
     CreateFakeIcon();
   }
 
   virtual void SetupMockPicker() {
     controller_->set_picker(&picker_);
@@ skipping 106 matching lines @@
   EXPECT_EQ(2, picker_.num_installed_services_);
   EXPECT_EQ(0, picker_.num_icons_changed_);
 
   OnServiceChosen(kServiceURL2,
                   webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(GetWindowDispositionTarget(
-      chrome::GetActiveTabContents(browser())->web_intent_picker_controller()));
+      WebIntentPickerController::FromWebContents(
+          chrome::GetActiveWebContents(browser()))));
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(1, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,
                        FetchExtensionIcon) {
   AddWebIntentService(kAction1, kServiceURL1);
@@ skipping 314 matching lines @@
   controller_->ShowDialog(kAction1, kType1);
   picker_.Wait();
 
   EXPECT_EQ(2, picker_.num_installed_services_);
 
   // The found default isn't used immediately because the defaulting
   // context has changed.
   ASSERT_EQ(1, browser()->tab_count());
   EXPECT_FALSE(dispatcher.dispatched_);
 }