device/bluetooth: split out transport enum

device/bluetooth/bluetooth_adapter.cc

 // Copyright (c) 2012 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 "device/bluetooth/bluetooth_adapter.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_discovery_session_outcome.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
+#include "device/bluetooth/bluetooth_types.h"
 
 namespace device {
 
 BluetoothAdapter::ServiceOptions::ServiceOptions() {
 }
 BluetoothAdapter::ServiceOptions::~ServiceOptions() {
 }
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
     !defined(OS_WIN) && !defined(OS_LINUX)
@@ skipping 315 matching lines @@
       // if masked_filter is pointing to empty filter, and there are
       // multiple empty filters in discovery_sessions_, make sure we'll
       // process next empty sessions.
       omit = false;
       continue;
     }
 
     if (first_merge) {
       first_merge = false;
       if (curr_filter) {
-        result.reset(new BluetoothDiscoveryFilter(
-            BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL));
+        result.reset(
+            new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
         result->CopyFrom(*curr_filter);
       }
       continue;
     }
 
     result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter);
   }
 
   return result;
 }
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStartOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Start.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStopOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Stop.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 }  // namespace device