Pass the frame instead of the WebContents through RunBluetoothChooser.

content/shell/browser/shell.cc

 // Copyright 2013 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 "content/shell/browser/shell.h"
 
 #include <stddef.h>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 366 matching lines @@
     const base::CommandLine& command_line =
         *base::CommandLine::ForCurrentProcess();
     dialog_manager_.reset(command_line.HasSwitch(switches::kRunLayoutTest)
         ? new LayoutTestJavaScriptDialogManager
         : new ShellJavaScriptDialogManager);
   }
   return dialog_manager_.get();
 }
 
 scoped_ptr<BluetoothChooser> Shell::RunBluetoothChooser(
-    WebContents* web_contents,
-    const BluetoothChooser::EventHandler& event_handler,
-    const url::Origin& origin) {
+    RenderFrameHost* frame,
+    const BluetoothChooser::EventHandler& event_handler) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kRunLayoutTest)) {
-    return BlinkTestController::Get()->RunBluetoothChooser(
-        web_contents, event_handler, origin);
+    return BlinkTestController::Get()->RunBluetoothChooser(frame,
+                                                           event_handler);
   }
   return nullptr;
 }
 
 bool Shell::AddMessageToConsole(WebContents* source,
                                 int32_t level,
                                 const base::string16& message,
                                 int32_t line_no,
                                 const base::string16& source_id) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 55 matching lines @@
   devtools_frontend_->Activate();
   devtools_frontend_->Focus();
 }
 
 void Shell::OnDevToolsWebContentsDestroyed() {
   devtools_observer_.reset();
   devtools_frontend_ = NULL;
 }
 
 }  // namespace content