Pass the frame instead of the WebContents through RunBluetoothChooser.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f16a9917f8d1c721bb021d922686ac9a613084ae..b5f04ec5736534c2328843942be3433dc58e0206 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1415,13 +1415,12 @@ void Browser::ShowCertificateViewerInDevTools(
 }
 
 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.
@@ -1429,7 +1428,8 @@ scoped_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser(
       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);