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

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index dc6089281ac9d06b61429f7e5fdcf3ad7900266d..b57b65b07d6356501723a71f5e3724ae62125549 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -11,6 +11,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
@@ -809,7 +810,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
       mojo::InterfaceRequest<blink::mojom::WebBluetoothService> request);
 
   // Deletes the Web Bluetooth Service owned by the frame.
-  void DeleteWebBluetoothService();
+  void DeleteWebBluetoothService(
+      WebBluetoothServiceImpl* web_bluetooth_service_ptr);

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

nit: drop _ptr in the param name.

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

Done.

 
   // service_manager::InterfaceFactory<media::mojom::InterfaceFactory>
   void Create(const service_manager::Identity& remote_identity,
@@ -990,7 +992,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
       app_web_message_port_message_filter_;
 #endif
 
-  std::unique_ptr<WebBluetoothServiceImpl> web_bluetooth_service_;
+  std::unordered_map<WebBluetoothServiceImpl*,
+                     std::unique_ptr<WebBluetoothServiceImpl>>
+      web_bluetooth_services_;

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

I think this needs a comment.

[Reilly Grant (use Gerrit), 2016/12/16 01:41:28]

You can use std::unordered_set<std::unique_ptr<WebBluetoothServiceImpl>> here
with the following trick to do removals:

void DeleteWebBluetoothService(WebBluetoothServiceImpl* impl) {
  std::unique_ptr<WebBluetoothServiceImpl> key(impl);
  auto it = web_bluetooth_services_.find(key);
  key.release();
  web_bluetooth_services_.erase(it);
}

[scheib, 2016/12/16 06:33:17]

;\ This is fairly hacky too.
How about find_if to remove:

    std::find_if(set.begin(), set.end(), 
      [to_remove](const std::unique_ptr<...>& i) -> bool { 
          return i.get() == to_remove; });

[esprehn, 2016/12/16 07:41:29]

Thats bad because it's doing something linear for no reason other than to work
around the stl being terrible when you have a container of unique_ptr. We should
wrap the pattern of putting the object in a wrapper and then releasing it in a
function in the base STLUtils.h and use it when we need it. We could also use
our own containers that don't have this limitation (ex. wtf ones allow
comparison between ptr wrapped types).

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

Use the same method that is used at:
https://cs.chromium.org/chromium/src/third_party/pdfium/fpdfsdk/javascript/ap...
https://cs.chromium.org/chromium/src/third_party/pdfium/third_party/base/stl_...
So added class FakeUniquePtr to //base/stl_util.h

Done.

 
   // The object managing the accessibility tree for this frame.
   std::unique_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;