bluetooth: Refactor repeated code used to find a Bluetooth object from its ID.

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>
 
@@ skipping 22 matching lines @@
   CHARACTERISTIC_STOP_NOTIFICATIONS = 7,
   // NOTE: Add new actions immediately above this line. Make sure to update
   // the enum list in tools/metrics/histograms/histograms.xml accordingly.
   COUNT
 };
 
 // There should be a call to this function for every call to the Web Bluetooth
 // API.
 void RecordWebBluetoothFunctionCall(UMAWebBluetoothFunction function);
 
+// Enumation for outcomes of querying the bluetooth cache.
+enum class CacheQueryOutcome {
+  SUCCESS = 0,

[scheib, 2015/10/20 17:55:33]

FYI it's fine to make these explicit, but it's a bit overkill since they are
never serialized. The values only have meaning within the single executable
build, and if the values change in the next build nothing breaks. 

[ortuno, 2015/10/20 17:59:11]

Ack.

+  BAD_RENDERER = 1,
+  NO_DEVICE = 2,
+  NO_SERVICE = 3,
+  NO_CHARACTERISTIC = 4,
+};
+
 // requestDevice() Metrics
 enum class UMARequestDeviceOutcome {
   SUCCESS = 0,
   NO_BLUETOOTH_ADAPTER = 1,
   NO_RENDER_FRAME = 2,
   OBSOLETE_DISCOVERY_START_FAILED = 3,
   OBSOLETE_DISCOVERY_STOP_FAILED = 4,
   OBSOLETE_NO_MATCHING_DEVICES_FOUND = 5,
   BLUETOOTH_ADAPTER_NOT_PRESENT = 6,
   OBSOLETE_BLUETOOTH_ADAPTER_OFF = 7,
@@ skipping 34 matching lines @@
   UNSUPPORTED_DEVICE = 9,
   // Note: Add new ConnectGATT outcomes immediately above this line. Make sure
   // to update the enum list in tools/metrics/histograms/histograms.xml
   // accordingly.
   COUNT
 };
 // There should be a call to this function before every
 // Send(BluetoothMsg_ConnectGATTSuccess) and
 // Send(BluetoothMsg_ConnectGATTError).
 void RecordConnectGATTOutcome(UMAConnectGATTOutcome outcome);
+// Records the outcome of the cache query for connectGATT. Should only be called
+// if QueryCacheForDevice fails.
+void RecordConnectGATTOutcome(CacheQueryOutcome outcome);
 // Records how long it took for the connection to succeed.
 void RecordConnectGATTTimeSuccess(const base::TimeDelta& duration);
 // Records how long it took for the connection to fail.
 void RecordConnectGATTTimeFailed(const base::TimeDelta& duration);
 
 // getPrimaryService() Metrics
 enum class UMAGetPrimaryServiceOutcome {
   SUCCESS = 0,
   NO_DEVICE = 1,
   NOT_FOUND = 2,
   // Note: Add new GetPrimaryService outcomes immediately above this line.
   // Make sure to update the enum list in
   // tools/metrics/histograms/histograms.xml accordingly.
   COUNT
 };
 // 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
 enum class UMAGetCharacteristicOutcome {
   SUCCESS = 0,
   NO_DEVICE = 1,
   NO_SERVICE = 2,
   NOT_FOUND = 3,
   // 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);
 
 // 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,
@@ skipping 26 matching lines @@
 // There should be a call to this function whenever the corresponding operation
 // doesn't have a call to Record[Operation]Outcome.
 void RecordGATTOperationOutcome(UMAGATTOperation operation,
                                 UMAGATTOperationOutcome outcome);
 
 // Characteristic.readValue() Metrics
 // There should be a call to this function for every call to
 // Send(BluetoothMsg_ReadCharacteristicValueSuccess) and
 // Send(BluetoothMsg_ReadCharacteristicValueError).
 void RecordCharacteristicReadValueOutcome(UMAGATTOperationOutcome error);
+// Records the outcome of a cache query for readValue. Should only be called if
+// QueryCacheForCharacteristic fails.
+void RecordCharacteristicReadValueOutcome(CacheQueryOutcome outcome);
 
 // Characteristic.writeValue() Metrics
 // There should be a call to this function for every call to
 // Send(BluetoothMsg_WriteCharacteristicValueSuccess) and
 // Send(BluetoothMsg_WriteCharacteristicValueError).
 void RecordCharacteristicWriteValueOutcome(UMAGATTOperationOutcome error);
+// Records the outcome of a cache query for writeValue. Should only be called if
+// QueryCacheForCharacteristic fails.
+void RecordCharacteristicWriteValueOutcome(CacheQueryOutcome outcome);
 
 // Characteristic.startNotifications() Metrics
 // There should be a call to this function for every call to
 // 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_