Switch WebIntentPickerController to use WebContentsUserData.

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
@@ skipping 335 matching lines @@
 bool ShellWindow::ShouldSuppressDialogs() {
   return true;
 }
 
 void ShellWindow::WebIntentDispatch(
     content::WebContents* web_contents,
     content::WebIntentsDispatcher* intents_dispatcher) {
   if (!web_intents::IsWebIntentsEnabledForProfile(profile_))
     return;
 
-  contents_->web_intent_picker_controller()->SetIntentsDispatcher(
-      intents_dispatcher);
-  contents_->web_intent_picker_controller()->ShowDialog(
+  WebIntentPickerController* web_intent_picker_controller =
+      WebIntentPickerController::FromWebContents(contents_->web_contents());
+  web_intent_picker_controller->SetIntentsDispatcher(intents_dispatcher);
+  web_intent_picker_controller->ShowDialog(
       intents_dispatcher->GetIntent().action,
       intents_dispatcher->GetIntent().type);
 }
 
 void ShellWindow::RunFileChooser(WebContents* tab,
                                  const content::FileChooserParams& params) {
   FileSelectHelper::RunFileChooser(tab, params);
 }
 
 bool ShellWindow::IsPopupOrPanel(const WebContents* source) const {
@@ skipping 85 matching lines @@
   if (window_key_.empty())
     return;
 
   extensions::ShellWindowGeometryCache* cache =
       extensions::ExtensionSystem::Get(profile())->
           shell_window_geometry_cache();
 
   gfx::Rect bounds = native_window_->GetBounds();
   cache->SaveGeometry(extension()->id(), window_key_, bounds);
 }