device/bluetooth: split out transport enum

device/bluetooth/bluetooth_discovery_filter.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 "device/bluetooth/bluetooth_discovery_filter.h"
 
 #include <memory>
 
+#include "device/bluetooth/bluetooth_types.h"
+
 namespace device {
 
 BluetoothDiscoveryFilter::BluetoothDiscoveryFilter(TransportMask transport) {
   SetTransport(transport);
 }
 
 BluetoothDiscoveryFilter::~BluetoothDiscoveryFilter() {
 }
 
 bool BluetoothDiscoveryFilter::GetRSSI(int16_t* out_rssi) const {
@@ skipping 80 matching lines @@
 std::unique_ptr<device::BluetoothDiscoveryFilter>
 BluetoothDiscoveryFilter::Merge(
     const device::BluetoothDiscoveryFilter* filter_a,
     const device::BluetoothDiscoveryFilter* filter_b) {
   std::unique_ptr<BluetoothDiscoveryFilter> result;
 
   if (!filter_a && !filter_b) {
     return result;
   }
 
-  result.reset(new BluetoothDiscoveryFilter(Transport::TRANSPORT_DUAL));
+  result.reset(
+      new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
 
   if (!filter_a || !filter_b || filter_a->IsDefault() ||
       filter_b->IsDefault()) {
     return result;
   }
 
   // both filters are not empty, so they must have transport set.
   result->SetTransport(filter_a->transport_ | filter_b->transport_);
 
   // if both filters have uuids, them merge them. Otherwise uuids filter should
@@ skipping 46 matching lines @@
   GetUUIDs(uuids_a);
   other.GetUUIDs(uuids_b);
   if (uuids_a != uuids_b)
     return false;
 
   return true;
 }
 
 bool BluetoothDiscoveryFilter::IsDefault() const {
   return !(rssi_.get() || pathloss_.get() || uuids_.size() ||
-           transport_ != Transport::TRANSPORT_DUAL);
+           transport_ != BluetoothTransport::TRANSPORT_DUAL);
 }
 
 }  // namespace device