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

content/browser/bluetooth/bluetooth_metrics.cc

 // 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.
 
 #include "content/browser/bluetooth/bluetooth_metrics.h"
 
 #include <map>
 #include <set>
 #include "base/hash.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 18 matching lines @@
 namespace content {
 
 // General
 
 void RecordWebBluetoothFunctionCall(UMAWebBluetoothFunction function) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.Web.FunctionCall.Count",
                             static_cast<int>(function),
                             static_cast<int>(UMAWebBluetoothFunction::COUNT));
 }
 
+static UMAGATTOperationOutcome TranslateCacheQueryOutcomeToGATT(
+    CacheQueryOutcome outcome) {
+  switch (outcome) {
+    case CacheQueryOutcome::NO_DEVICE:
+      return UMAGATTOperationOutcome::NO_DEVICE;
+    case CacheQueryOutcome::NO_SERVICE:
+      return UMAGATTOperationOutcome::NO_SERVICE;
+    case CacheQueryOutcome::NO_CHARACTERISTIC:
+      return UMAGATTOperationOutcome::NO_CHARACTERISTIC;
+    default:
+      NOTIMPLEMENTED();
+      return UMAGATTOperationOutcome::NOT_SUPPORTED;
+  }
+}
+
+void RecordOutcomeWithCacheQueryResult(UMAWebBluetoothFunction function,
+                                       CacheQueryOutcome outcome) {
+  switch (function) {
+    case UMAWebBluetoothFunction::CONNECT_GATT:
+      DCHECK(outcome == CacheQueryOutcome::NO_DEVICE);
+      RecordConnectGATTOutcome(UMAConnectGATTOutcome::NO_DEVICE);
+      return;
+    case UMAWebBluetoothFunction::GET_PRIMARY_SERVICE:
+      DCHECK(outcome == CacheQueryOutcome::NO_DEVICE);
+      RecordGetPrimaryServiceOutcome(UMAGetPrimaryServiceOutcome::NO_DEVICE);
+      return;
+    case UMAWebBluetoothFunction::GET_CHARACTERISTIC:
+      switch (outcome) {
+        case CacheQueryOutcome::NO_DEVICE:
+          RecordGetCharacteristicOutcome(
+              UMAGetCharacteristicOutcome::NO_DEVICE);
+          return;
+        case CacheQueryOutcome::NO_SERVICE:
+          RecordGetCharacteristicOutcome(
+              UMAGetCharacteristicOutcome::NO_SERVICE);
+          return;
+        default:
+          NOTIMPLEMENTED();

[scheib, 2015/10/19 23:15:54]

I suggest not using 'default' in switch statements. Without it the compiler will
inform developers when adding a new enum what they have to fix. List cases
explicitly that are not handled.

[ortuno, 2015/10/20 17:44:03]

Done.

+          return;
+      }
+    case UMAWebBluetoothFunction::CHARACTERISTIC_READ_VALUE:
+      RecordCharacteristicReadValueOutcome(
+          TranslateCacheQueryOutcomeToGATT(outcome));
+      return;
+    case UMAWebBluetoothFunction::CHARACTERISTIC_WRITE_VALUE:
+      RecordCharacteristicWriteValueOutcome(
+          TranslateCacheQueryOutcomeToGATT(outcome));
+      return;
+    case UMAWebBluetoothFunction::CHARACTERISTIC_START_NOTIFICATIONS:
+      RecordStartNotificationsOutcome(
+          TranslateCacheQueryOutcomeToGATT(outcome));
+      return;
+    default:
+      NOTIMPLEMENTED();
+  }
+}
+
 // requestDevice()
 
 void RecordRequestDeviceOutcome(UMARequestDeviceOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.Web.RequestDevice.Outcome",
                             static_cast<int>(outcome),
                             static_cast<int>(UMARequestDeviceOutcome::COUNT));
 }
 
 static void RecordRequestDeviceFilters(
     const std::vector<content::BluetoothScanFilter>& filters) {
@@ skipping 130 matching lines @@
 
 // Characteristic.startNotifications
 void RecordStartNotificationsOutcome(UMAGATTOperationOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.Web.Characteristic.StartNotifications.Outcome",
       static_cast<int>(outcome),
       static_cast<int>(UMAGATTOperationOutcome::COUNT));
 }
 
 }  // namespace content