Pass the frame instead of the WebContents through RunBluetoothChooser.

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 1397 matching lines @@
 
 void Browser::ShowCertificateViewerInDevTools(
     content::WebContents* web_contents, int cert_id) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(web_contents);
   if (devtools_window)
     devtools_window->ShowCertificateViewer(cert_id);
 }
 
 scoped_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser(
-    content::WebContents* web_contents,
-    const content::BluetoothChooser::EventHandler& event_handler,
-    const url::Origin& origin) {
+    content::RenderFrameHost* frame,
+    const content::BluetoothChooser::EventHandler& event_handler) {
   scoped_ptr<BluetoothChooserDesktop> bluetooth_chooser_desktop(
       new BluetoothChooserDesktop(event_handler));
   scoped_ptr<BluetoothChooserBubbleDelegate> bubble_delegate(
-      new BluetoothChooserBubbleDelegate(web_contents->GetMainFrame()));
+      new BluetoothChooserBubbleDelegate(frame));
   BluetoothChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get();
 
   // Wire the ChooserBubbleDelegate to the BluetoothChooser.
   bluetooth_chooser_desktop->set_bluetooth_chooser_bubble_delegate(
       bubble_delegate_ptr);
   bubble_delegate->set_bluetooth_chooser(bluetooth_chooser_desktop.get());
 
-  Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+  Browser* browser = chrome::FindBrowserWithWebContents(
+      WebContents::FromRenderFrameHost(frame));
   BubbleReference bubble_controller =
       browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate));
   bubble_delegate_ptr->set_bubble_controller(bubble_controller);
 
   return std::move(bluetooth_chooser_desktop);
 }
 
 bool Browser::RequestAppBanner(content::WebContents* web_contents) {
   banners::AppBannerManagerDesktop* manager =
       banners::AppBannerManagerDesktop::FromWebContents(web_contents);
@@ skipping 1287 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }