Index: content/test/layouttest_support.cc |
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc |
index 77d3aa6952b49794746513c4244a69eca67af90f..47399701975ebdc65a3c77a1cf06afd524537878 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,7 +314,8 @@ 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, |
scheib
2015/05/16 02:39:14
Only change signature once here and https://codere
ortuno
2015/05/18 17:41:55
Needs to change twice.
|
+ scoped_refptr<device::BluetoothAdapter> adapter) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
RenderProcessHostImpl* render_process_host_impl = |
@@ -325,7 +327,7 @@ void SetBluetoothAdapter(int render_process_id, const std::string& name) { |
render_process_host_impl->GetBluetoothDispatcherHost(); |
DCHECK(bdh); |
- bdh->SetBluetoothAdapterForTesting(name); |
+ bdh->SetBluetoothAdapterForTesting(adapter.Pass()); |
} |
void SetGeofencingMockProvider(bool service_available) { |