Pass the frame instead of the WebContents through RunBluetoothChooser.

chrome/browser/android/tab_web_contents_delegate_android.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/android/tab_web_contents_delegate_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 105 matching lines @@
   LoadProgressChanged(source, has_stopped ? 1 : 0);
 }
 
 void TabWebContentsDelegateAndroid::RunFileChooser(
     WebContents* web_contents,
     const FileChooserParams& params) {
   FileSelectHelper::RunFileChooser(web_contents, params);
 }
 
 scoped_ptr<BluetoothChooser> TabWebContentsDelegateAndroid::RunBluetoothChooser(
-    content::WebContents* web_contents,
-    const BluetoothChooser::EventHandler& event_handler,
-    const url::Origin& origin) {
-  return make_scoped_ptr(
-      new BluetoothChooserAndroid(web_contents, event_handler, origin));
+    content::RenderFrameHost* frame,
+    const BluetoothChooser::EventHandler& event_handler) {
+  return make_scoped_ptr(new BluetoothChooserAndroid(frame, event_handler));
 }
 
 void TabWebContentsDelegateAndroid::CloseContents(
     WebContents* web_contents) {
   // Prevent dangling registrations assigned to closed web contents.
   if (notification_registrar_.IsRegistered(this,
       chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
       content::Source<WebContents>(web_contents))) {
     notification_registrar_.Remove(this,
         chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
@@ skipping 342 matching lines @@
 jboolean IsCapturingVideo(JNIEnv* env,
                           const JavaParamRef<jclass>& clazz,
                           const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()->
           GetMediaStreamCaptureIndicator();
   return indicator->IsCapturingVideo(web_contents);
 }