| Index: content/test/layouttest_support.cc
|
| diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
|
| index 0ae2b51f64c057de6a2306e285857f0272fc908a..eae4eb91bad5474ba3263c72737e187caf1240ac 100644
|
| --- a/content/test/layouttest_support.cc
|
| +++ b/content/test/layouttest_support.cc
|
| @@ -24,6 +24,7 @@
|
| #include "content/shell/renderer/test_runner/test_common.h"
|
| #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
|
| #include "content/shell/renderer/test_runner/web_test_proxy.h"
|
| +#include "device/bluetooth/bluetooth_adapter.h"
|
| #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
|
| #include "third_party/WebKit/public/platform/WebGamepads.h"
|
| #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
|
| @@ -313,14 +314,15 @@ void SetDeviceColorProfile(RenderView* render_view, const std::string& name) {
|
| SetDeviceColorProfileForTesting(color_profile);
|
| }
|
|
|
| -void SetBluetoothAdapter(int render_process_id, const std::string& name) {
|
| +void SetBluetoothAdapter(int render_process_id,
|
| + scoped_refptr<device::BluetoothAdapter> adapter) {
|
| RenderProcessHostImpl* render_process_host_impl =
|
| static_cast<RenderProcessHostImpl*>(
|
| RenderProcessHost::FromID(render_process_id));
|
|
|
| render_process_host_impl
|
| ->GetBluetoothDispatcherHost()
|
| - ->SetBluetoothAdapterForTesting(name);
|
| + ->SetBluetoothAdapterForTesting(adapter.Pass());
|
| }
|
|
|
| void SetGeofencingMockProvider(bool service_available) {
|
|
|