[Onion Soup] Move WebBluetoothImpl from //content/renderer/bluetooth to Blink's bluetooth module

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 07fc76005bd703b1b9a19dadc775e921fefab82b..3880a7b8d58426c9e33d8ff69f9621ac088b8391 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3208,19 +3208,26 @@ void RenderFrameHostImpl::AXContentTreeDataToAXTreeData(
 
 WebBluetoothServiceImpl* RenderFrameHostImpl::CreateWebBluetoothService(
     blink::mojom::WebBluetoothServiceRequest request) {
-  DCHECK(!web_bluetooth_service_);
-  web_bluetooth_service_.reset(
-      new WebBluetoothServiceImpl(this, std::move(request)));
   // RFHI owns web_bluetooth_service_ and web_bluetooth_service owns the
   // binding_ which may run the error handler. binding_ can't run the error
   // handler after it's destroyed so it can't run after the RFHI is destroyed.
-  web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
-      &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
-  return web_bluetooth_service_.get();
-}
-
-void RenderFrameHostImpl::DeleteWebBluetoothService() {
-  web_bluetooth_service_.reset();
+  std::unique_ptr<WebBluetoothServiceImpl> web_bluetooth_service =
+      base::MakeUnique<WebBluetoothServiceImpl>(this, std::move(request));
+  WebBluetoothServiceImpl* web_bluetooth_service_ptr =
+      web_bluetooth_service.get();

[dougt, 2016/12/16 00:11:44]

I would probably not have this local variable, can call .get() directly as it
would be clearer to the reader.

[juncai, 2016/12/17 01:18:51]

Done.

+  web_bluetooth_service->SetClientConnectionErrorHandler(
+      base::Bind(&RenderFrameHostImpl::DeleteWebBluetoothService,
+                 base::Unretained(this), web_bluetooth_service_ptr));
+  web_bluetooth_services_.insert(std::make_pair(
+      web_bluetooth_service_ptr, std::move(web_bluetooth_service)));
+  return web_bluetooth_service_ptr;
+}
+
+void RenderFrameHostImpl::DeleteWebBluetoothService(
+    WebBluetoothServiceImpl* web_bluetooth_service_ptr) {

[dougt, 2016/12/16 00:11:44]

remove _ptr

[juncai, 2016/12/17 01:18:51]

Done.

+  auto it = web_bluetooth_services_.find(web_bluetooth_service_ptr);
+  DCHECK(it != web_bluetooth_services_.end());
+  web_bluetooth_services_.erase(it);
 }
 
 void RenderFrameHostImpl::Create(