bluetooth: Move GetCharacteristic(s) over to Mojo

content/browser/bluetooth/bluetooth_dispatcher_host.h

Index: content/browser/bluetooth/bluetooth_dispatcher_host.h
diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.h b/content/browser/bluetooth/bluetooth_dispatcher_host.h
index 7a1756c198a1af8bdfe7e87f1dadedb6fbabcc24..f8ae1667fd5c2c86151ffc6fcc257ac90f7e7d2a 100644
--- a/content/browser/bluetooth/bluetooth_dispatcher_host.h
+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.h
@@ -14,8 +14,6 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
-#include "content/browser/bluetooth/bluetooth_metrics.h"
-#include "content/common/bluetooth/bluetooth_messages.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "device/bluetooth/bluetooth_adapter.h"
@@ -30,6 +28,7 @@ class BluetoothUUID;
 namespace content {
 
 struct BluetoothScanFilter;
+struct CacheQueryResult;
 
 // Dispatches and sends bluetooth related messages sent to/from a child
 // process BluetoothDispatcher from/to the main browser process.
@@ -55,28 +54,10 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
   void SetBluetoothAdapterForTesting(
       scoped_refptr<device::BluetoothAdapter> mock_adapter);
 
-  // TODO(ortuno): We temporarily make this a public struct so that
-  // both BluetoothDispatcherHost and WebBluetoothServiceImpl can use it,
-  // while we move functions from BluetoothDispatcherHost to
-  // WebBluetoothServiceImpl.
-  // https://crbug.com/508771
-  struct CacheQueryResult {
-    CacheQueryResult();
-    CacheQueryResult(CacheQueryOutcome outcome);
-    ~CacheQueryResult();
-    blink::WebBluetoothError GetWebError() const;
-    device::BluetoothDevice* device = nullptr;
-    device::BluetoothGattService* service = nullptr;
-    device::BluetoothGattCharacteristic* characteristic = nullptr;
-    CacheQueryOutcome outcome = CacheQueryOutcome::SUCCESS;
-  };
-
-  // Queries the platform cache for a characteristic with
-  // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
-  // |service| and |characteristic| fields if successful.
-  CacheQueryResult QueryCacheForCharacteristic(
-      const url::Origin& origin,
-      const std::string& characteristic_instance_id);
+  // Queries the platform cache for a Service with |service_instance_id|. Fills
+  // in the |outcome| field, and |device| and |service| fields if successful.
+  CacheQueryResult QueryCacheForService(const url::Origin& origin,

[Jeffrey Yasskin, 2016/04/22 01:16:37]

It might make sense to make BluetoothServiceImpl a friend so you don't need to
gradually rearrange things into the public section during this refactoring.

[ortuno, 2016/04/25 15:29:45]

Done.

+                                        const std::string& service_instance_id);
 
   // Temporary functions so that WebBluetoothServices can add themselves as
   // observers of the Bluetooth Adapter without having to get an adapter for
@@ -167,16 +148,6 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
                            int frame_routing_id,
                            const std::string& device_id,
                            const std::string& service_uuid);
-  void OnGetCharacteristic(int thread_id,
-                           int request_id,
-                           int frame_routing_id,
-                           const std::string& service_instance_id,
-                           const std::string& characteristic_uuid);
-  void OnGetCharacteristics(int thread_id,
-                            int request_id,
-                            int frame_routing_id,
-                            const std::string& service_instance_id,
-                            const std::string& characteristics_uuid);
 
   // Callbacks for BluetoothDevice::OnRequestDevice.
   // If necessary, the adapter must be obtained before continuing to Impl.
@@ -241,10 +212,6 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
   // Fills in the |outcome| field and the |device| field if successful.
   CacheQueryResult QueryCacheForDevice(const url::Origin& origin,
                                        const std::string& device_id);
-  // Queries the platform cache for a Service with |service_instance_id|. Fills
-  // in the |outcome| field, and |device| and |service| fields if successful.
-  CacheQueryResult QueryCacheForService(const url::Origin& origin,
-                                        const std::string& service_instance_id);
 
   // Adds the PrimaryServicesRequest to the vector of pending services requests
   // for that device.
@@ -269,8 +236,6 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
   // Maps to get the object's parent based on it's instanceID
   // Map of service_instance_id to device_address.
   std::map<std::string, std::string> service_to_device_;
-  // Map of characteristic_instance_id to service_instance_id.
-  std::map<std::string, std::string> characteristic_to_service_;
 
   // Defines how long to scan for and how long to discover services for.
   int current_delay_time_;