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

third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h b/third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h
index 17177a84555178f54514bfa6707e62c7538f6060..50ba595002becbe6d82f0851f73676f5b34e8c36 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothAttributeInstanceMap.h
@@ -16,9 +16,6 @@ namespace blink {
 class BluetoothDevice;
 class ExecutionContext;
 
-struct WebBluetoothRemoteGATTCharacteristicInit;
-struct WebBluetoothRemoteGATTService;
-
 // Map that holds all GATT attributes, i.e. BluetoothRemoteGATTService,
 // BluetoothRemoteGATTCharacteristic, BluetoothRemoteGATTDescriptor, for
 // the BluetoothDevice passed in when constructing the object.
@@ -33,7 +30,10 @@ class BluetoothAttributeInstanceMap final
   // Otherwise returns the BluetoothRemoteGATTService object already
   // in the map.
   BluetoothRemoteGATTService* getOrCreateBluetoothRemoteGATTService(
-      std::unique_ptr<WebBluetoothRemoteGATTService>);
+      const String& serviceInstanceId,
+      const String& uuid,
+      bool isPrimary,
+      const String& deviceInstanceId);

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

I think you can drop the parameter names here. (see rest of file)

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

I'd prefer we leave the parameter names when they're all strings, ints or bools
as otherwise the header is useless as documentation.

 
   // Returns true if a BluetoothRemoteGATTService with |serviceInstanceId|
   // is in the map.
@@ -46,7 +46,10 @@ class BluetoothAttributeInstanceMap final
   BluetoothRemoteGATTCharacteristic*
   getOrCreateBluetoothRemoteGATTCharacteristic(
       ExecutionContext*,
-      std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit>,
+      const String& characteristicInstanceId,
+      const String& serviceInstanceId,
+      const String& uuid,
+      uint32_t characteristicProperties,
       BluetoothRemoteGATTService*);

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

same.

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

Based on reillyg@'s comment, keep the parameter names here.

 
   // Returns true if a BluetoothRemoteGATTCharacteristic with