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_common.h"
+
 namespace device {
 
-BluetoothDiscoveryFilter::BluetoothDiscoveryFilter(TransportMask transport) {
+BluetoothDiscoveryFilter::BluetoothDiscoveryFilter(
+    BluetoothTransport transport) {
   SetTransport(transport);
 }
 
 BluetoothDiscoveryFilter::~BluetoothDiscoveryFilter() {
 }
 
 bool BluetoothDiscoveryFilter::GetRSSI(int16_t* out_rssi) const {
   DCHECK(out_rssi);
   if (!rssi_.get())
     return false;
@@ skipping 18 matching lines @@
   return true;
 }
 
 void BluetoothDiscoveryFilter::SetPathloss(uint16_t pathloss) {
   if (!pathloss_.get())
     pathloss_.reset(new uint16_t());
 
   *pathloss_ = pathloss;
 }
 
-BluetoothDiscoveryFilter::TransportMask BluetoothDiscoveryFilter::GetTransport()
-    const {
+BluetoothTransport BluetoothDiscoveryFilter::GetTransport() const {
   return transport_;
 }
 
-void BluetoothDiscoveryFilter::SetTransport(TransportMask transport) {
+void BluetoothDiscoveryFilter::SetTransport(BluetoothTransport transport) {
   DCHECK(transport > 0 && transport < 4);
   transport_ = transport;
 }
 
 void BluetoothDiscoveryFilter::GetUUIDs(
     std::set<device::BluetoothUUID>& out_uuids) const {
   out_uuids.clear();
 
   for (auto& uuid : uuids_)
     out_uuids.insert(*uuid);
@@ skipping 33 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(BLUETOOTH_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_);
+  result->SetTransport(static_cast<BluetoothTransport>(filter_a->transport_ |

[ortuno, 2016/06/15 23:09:31]

Why do you need this static_cast?

+                                                       filter_b->transport_));
 
   // if both filters have uuids, them merge them. Otherwise uuids filter should
   // be left empty
   if (filter_a->uuids_.size() && filter_b->uuids_.size()) {
     std::set<device::BluetoothUUID> uuids;
     filter_a->GetUUIDs(uuids);
     for (auto& uuid : uuids)
       result->AddUUID(uuid);
 
     filter_b->GetUUIDs(uuids);
@@ skipping 38 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_ != BLUETOOTH_TRANSPORT_DUAL);
 }
 
 }  // namespace device