bluetooth: Move GetCharacteristic(s) over to Mojo

content/browser/bluetooth/web_bluetooth_service_impl.h

 // Copyright 2016 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_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #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"
 #include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 
 namespace url {
@@ skipping 46 matching lines @@
   // Notifies the WebBluetoothServiceClient that characteristic
   // |characteristic_instance_id| changed it's value. We only do this for
   // characteristics that have been returned to the client in the past.
   void NotifyCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       std::vector<uint8_t> value);
 
   // 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;
   void RemoteCharacteristicWriteValue(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value,
       const RemoteCharacteristicWriteValueCallback& callback) override;
   void RemoteCharacteristicStartNotifications(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicStartNotificationsCallback& callback) override;
@@ skipping 21 matching lines @@
       std::unique_ptr<device::BluetoothGattNotifySession> notify_session);
   void OnStartNotifySessionFailed(
       const RemoteCharacteristicStartNotificationsCallback& callback,
       device::BluetoothRemoteGattService::GattErrorCode error_code);
 
   // Callback for BluetoothGattNotifySession::Stop.
   void OnStopNotifySessionComplete(
       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);
   url::Origin GetOrigin();
 
   // 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>>
       characteristic_id_to_notify_session_;
 
   // The RFH that owns this instance.
   RenderFrameHost* render_frame_host_;
 
   // Proxy to the WebBluetoothServiceClient to send device events to.
   blink::mojom::WebBluetoothServiceClientAssociatedPtr client_;
 
   // The lifetime of this instance is exclusively managed by the RFH that
   // owns it so we use a "Binding" as opposed to a "StrongBinding" which deletes
   // the service on pipe connection errors.
   mojo::Binding<blink::mojom::WebBluetoothService> binding_;
 
   base::WeakPtrFactory<WebBluetoothServiceImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_