bluetooth: Move GetCharacteristic(s) over to Mojo

content/browser/bluetooth/web_bluetooth_service_impl.h

Index: content/browser/bluetooth/web_bluetooth_service_impl.h
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.h b/content/browser/bluetooth/web_bluetooth_service_impl.h
index f0677515b7315f13e084aebb0cb71ee78ec7bafd..e953da4e276277ca87bf6edf6a78d14a6f187c0a 100644
--- a/content/browser/bluetooth/web_bluetooth_service_impl.h
+++ b/content/browser/bluetooth/web_bluetooth_service_impl.h
@@ -11,6 +11,7 @@
 
 #include "base/macros.h"
 #include "content/browser/bad_message.h"
+#include "content/browser/bluetooth/cache_query_result.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "device/bluetooth/bluetooth_adapter.h"
@@ -77,8 +78,11 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,
   // WebBluetoothService methods:
   void SetClient(
       blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo client) override;
-
-  // WebBluetoothService methods:
+  void RemoteServiceGetCharacteristics(
+      const mojo::String& service_instance_id,
+      blink::mojom::WebBluetoothGATTQueryQuantity quantity,
+      const mojo::String& characteristics_uuid,
+      const RemoteServiceGetCharacteristicsCallback& callback) override;
   void RemoteCharacteristicReadValue(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicReadValueCallback& callback) override;
@@ -120,6 +124,20 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,
       const std::string& characteristic_instance_id,
       const RemoteCharacteristicStopNotificationsCallback& callback);
 
+  // Functions to query the platform cache for the bluetooth object.
+  // result.outcome == CacheQueryOutcome::SUCCESS if the object was found in the
+  // cache. Otherwise result.outcome that can used to record the outcome and
+  // result.error will contain the error that should be send to the renderer.

[palmer, 2016/04/25 21:19:01]

Typo: "...sent to..."

[ortuno, 2016/04/25 22:43:23]

Done.

+  // One of the possible outcomes is BAD_RENDERER. In this case we crash the
+  // renderer, record the reason and close the pipe, so it's safe to drop
+  // any callbacks.
+
+  // 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 std::string& characteristic_instance_id);
+
   RenderProcessHost* GetRenderProcessHost();
   BluetoothDispatcherHost* GetBluetoothDispatcherHost();
   void CrashRendererAndClosePipe(bad_message::BadMessageReason reason);
@@ -128,6 +146,10 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,
   // Clears all state (maps, sets, etc).
   void ClearState();
 
+  // Maps to get the object's parent based on it's instanceID.

[palmer, 2016/04/25 21:19:01]

Typo: "its".

Since this comment is introducing several things below, have a blank line after
it. (As you did on line 134, above.)

[ortuno, 2016/04/25 22:43:23]

Done.
Done.

+  // Map of characteristic_instance_id to service_instance_id.
+  std::unordered_map<std::string, std::string> characteristic_to_service_;

[palmer, 2016/04/25 21:19:01]

Not |characteristic_id_to_service_|, to match
|characteristic_id_to_notify_session_|? (I'm not sure which is right, just
wondering about consistency.)

[ortuno, 2016/04/25 22:43:23]

Changed to characteristic_id_to_service_id_.

+
   // Map to keep track of the characteristics' notify sessions.
   std::unordered_map<std::string,
                      std::unique_ptr<device::BluetoothGattNotifySession>>