| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index d1e89938eed79cf680da24c78b0fc7131881b373..9026ea0b35a1abab3a460983282f85e692715abb 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -4342,13 +4342,9 @@ void RenderFrameImpl::unregisterProtocolHandler(const WebString& scheme,
|
| }
|
|
|
| blink::WebBluetooth* RenderFrameImpl::bluetooth() {
|
| - // ChildThreadImpl::current() is null in some tests.
|
| - if (!bluetooth_ && ChildThreadImpl::current()) {
|
| - bluetooth_.reset(new WebBluetoothImpl(
|
| - GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
|
| - routing_id_));
|
| + if (!bluetooth_.get()) {
|
| + bluetooth_.reset(new WebBluetoothImpl(GetServiceRegistry()));
|
| }
|
| -
|
| return bluetooth_.get();
|
| }
|
|
|
|
|