bluetooth: Move GetCharacteristic(s) over to Mojo

content/browser/bluetooth/bluetooth_metrics.h

 // Copyright 2015 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_BLUETOOTH_METRICS_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_METRICS_H_
 
 #include <string>
 #include <vector>
 
 namespace base {
 class TimeDelta;
 }
 
 namespace device {
 class BluetoothUUID;
 }
 
 namespace content {
 struct BluetoothScanFilter;
 
 // General Metrics
 
 // Enumaration of each Web Bluetooth API entry point.
 enum class UMAWebBluetoothFunction {
   REQUEST_DEVICE = 0,
   CONNECT_GATT = 1,
   GET_PRIMARY_SERVICE = 2,
-  GET_CHARACTERISTIC = 3,
+  SERVICE_GET_CHARACTERISTIC = 3,
   CHARACTERISTIC_READ_VALUE = 4,
   CHARACTERISTIC_WRITE_VALUE = 5,
   CHARACTERISTIC_START_NOTIFICATIONS = 6,
   CHARACTERISTIC_STOP_NOTIFICATIONS = 7,
   REMOTE_GATT_SERVER_DISCONNECT = 8,
   SERVICE_GET_CHARACTERISTICS = 9,
   // NOTE: Add new actions immediately above this line. Make sure to update
   // the enum list in tools/metrics/histograms/histograms.xml accordingly.
   COUNT
 };
@@ skipping 100 matching lines @@
 // Record the service uuid used when calling getPrimaryService.
 void RecordGetPrimaryServiceService(const device::BluetoothUUID& service);
 // There should be a call to this function for every call to
 // Send(BluetoothMsg_GetPrimaryServiceSuccess) and
 // Send(BluetoothMsg_GetPrimaryServiceError).
 void RecordGetPrimaryServiceOutcome(UMAGetPrimaryServiceOutcome outcome);
 // Records the outcome of the cache query for getPrimaryService. Should only be
 // called if QueryCacheForDevice fails.
 void RecordGetPrimaryServiceOutcome(CacheQueryOutcome outcome);
 
-// getCharacteristic() Metrics
+// getCharacteristic() & getCharacteristics() Metrics

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

nit: I'd spell out "and" since & is a C++ token.

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

Done.

 enum class UMAGetCharacteristicOutcome {
   SUCCESS = 0,
   NO_DEVICE = 1,
   NO_SERVICE = 2,
   NOT_FOUND = 3,
   BLACKLISTED = 4,
   NO_CHARACTERISTICS = 5,
   // Note: Add new outcomes immediately above this line.
   // Make sure to update the enum list in
   // tools/metrisc/histogram/histograms.xml accordingly.
   COUNT
 };
-// There should be a call to this function for every call to
-// Send(BluetoothMsg_GetCharacteristicSuccess) and
-// Send(BluetoothMsg_GetCharacteristicError).
-void RecordGetCharacteristicOutcome(UMAGetCharacteristicOutcome outcome);
-// Records the outcome of the cache query for getCharacteristic. Should only be
-// called if QueryCacheForService fails.
-void RecordGetCharacteristicOutcome(CacheQueryOutcome outcome);
-// Records the UUID of the characteristic used when calling getCharacteristic.
-void RecordGetCharacteristicCharacteristic(const std::string& characteristic);
 
-// getCharacteristics() Metrics
-// There should be a call to this function for every call to
-// Send(BluetoothMsg_GetCharacteristicsSuccess) and
-// Send(BluetoothMsg_GetCharacteristicsError).
-void RecordGetCharacteristicsOutcome(UMAGetCharacteristicOutcome outcome);
+// There should be a call to this function whenever
+// RemoteServiceGetCharacteristicsCallback is run.
+// |single_characteristic| should be true for getCharacteristic calls.
+void RecordGetCharacteristicsOutcome(bool single_characteristic,

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

Prefer enum-classes over boolean arguments unless the meaning of 'true' is
really clear at the call site.

You could name this enum to work with getPrimaryServices(),
getIncludedServices(), and getDescriptors() too.

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

Done.

+                                     UMAGetCharacteristicOutcome outcome);
 // Records the outcome of the cache query for getCharacteristics. Should only be
 // called if QueryCacheForService fails.
-void RecordGetCharacteristicsOutcome(CacheQueryOutcome outcome);
+void RecordGetCharacteristicsOutcome(bool single_characteristic,
+                                     CacheQueryOutcome outcome);
 // Records the UUID of the characteristic used when calling getCharacteristic.
-void RecordGetCharacteristicsCharacteristic(const std::string& characteristic);
+void RecordGetCharacteristicsCharacteristic(bool single_characteristic,
+                                            const std::string& characteristic);
 
 // GATT Operations Metrics
 
 // These are the possible outcomes when performing GATT operations i.e.
 // characteristic.readValue/writeValue descriptor.readValue/writeValue.
 enum UMAGATTOperationOutcome {
   SUCCESS = 0,
   NO_DEVICE = 1,
   NO_SERVICE = 2,
   NO_CHARACTERISTIC = 3,
@@ skipping 50 matching lines @@
 // Send(BluetoothMsg_StartNotificationsSuccess) and
 // Send(BluetoothMsg_StopNotificationsError).
 void RecordStartNotificationsOutcome(UMAGATTOperationOutcome outcome);
 // Records the outcome of a cache query for startNotifications. Should only be
 // called if QueryCacheForCharacteristic fails.
 void RecordStartNotificationsOutcome(CacheQueryOutcome outcome);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_METRICS_H_