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

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ skipping 778 matching lines @@
   // FrameTreeNode that is not a child of this node.
   FrameTreeNode* FindAndVerifyChild(int32_t child_frame_routing_id,
                                     bad_message::BadMessageReason reason);
 
   // Creates Web Bluetooth Service owned by the frame. Returns a raw pointer
   // to it.
   WebBluetoothServiceImpl* CreateWebBluetoothService(
       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,
               media::mojom::InterfaceFactoryRequest request) override;
 
   // Callback for connection error on the media::mojom::InterfaceFactory client.
   void OnMediaInterfaceFactoryConnectionError();
 
   // Allows tests to disable the swapout event timer to simulate bugs that
   // happen before it fires (to avoid flakiness).
@@ skipping 160 matching lines @@
   service_manager::ServiceInfo renderer_info_;
 
   int on_connect_handler_id_ = 0;
 
 #if defined(OS_ANDROID)
   // The filter for MessagePort messages between an Android apps and web.
   scoped_refptr<AppWebMessagePortMessageFilter>
       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_;
 
   // This is nonzero if we sent an accessibility reset to the renderer and
   // we're waiting for an IPC containing this reset token (sequentially
   // assigned) and a complete replacement accessibility tree.
   int accessibility_reset_token_;
 
   // A count of the number of times we needed to reset accessibility, so
@@ skipping 88 matching lines @@
       remote_associated_interfaces_;
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_