device/bluetooth: split out transport enum

device/bluetooth/bluez/bluetooth_adapter_bluez.cc

 // Copyright 2013 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/bluez/bluetooth_adapter_bluez.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session_outcome.h"
 #include "device/bluetooth/bluetooth_socket_thread.h"
+#include "device/bluetooth/bluetooth_types.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/bluez/bluetooth_adapter_profile_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_advertisement_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_audio_sink_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_device_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_gatt_service_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_pairing_bluez.h"
 #include "device/bluetooth/bluez/bluetooth_socket_bluez.h"
 #include "device/bluetooth/dbus/bluetooth_adapter_client.h"
 #include "device/bluetooth/dbus/bluetooth_agent_manager_client.h"
 #include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
 #include "device/bluetooth/dbus/bluetooth_device_client.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_application_service_provider.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_manager_client.h"
 #include "device/bluetooth/dbus/bluetooth_input_client.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/system/devicetype.h"
 #endif
 
 using device::BluetoothAdapter;
 using device::BluetoothAudioSink;
 using device::BluetoothDevice;
 using device::BluetoothDiscoveryFilter;
 using device::BluetoothSocket;
+using device::BluetoothTransport;
 using device::BluetoothUUID;
 using device::UMABluetoothDiscoverySessionOutcome;
 
 namespace {
 
 // The agent path is relatively meaningless since BlueZ only permits one to
 // exist per D-Bus connection, it just has to be unique within Chromium.
 const char kAgentPath[] = "/org/chromium/bluetooth_agent";
 const char kGattApplicationObjectPath[] = "/gatt_application";
 
@@ skipping 1203 matching lines @@
                        callback, error_callback);
     return;
   }
 
   // There are no active discovery sessions.
   DCHECK_EQ(num_discovery_sessions_, 0);
 
   if (discovery_filter) {
     discovery_request_pending_ = true;
 
-    std::unique_ptr<BluetoothDiscoveryFilter> df(new BluetoothDiscoveryFilter(
-        BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL));
+    std::unique_ptr<BluetoothDiscoveryFilter> df(
+        new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
     df->CopyFrom(*discovery_filter);
     SetDiscoveryFilter(
         std::move(df),
         base::Bind(&BluetoothAdapterBlueZ::OnPreSetDiscoveryFilter,
                    weak_ptr_factory_.GetWeakPtr(), callback, error_callback),
         base::Bind(&BluetoothAdapterBlueZ::OnPreSetDiscoveryFilterError,
                    weak_ptr_factory_.GetWeakPtr(), callback, error_callback));
     return;
   } else {
     current_filter_.reset();
@@ skipping 96 matching lines @@
     uint8_t transport;
     std::set<device::BluetoothUUID> uuids;
 
     if (current_filter_->GetPathloss(&pathloss))
       dbus_discovery_filter.pathloss.reset(new uint16_t(pathloss));
 
     if (current_filter_->GetRSSI(&rssi))
       dbus_discovery_filter.rssi.reset(new int16_t(rssi));
 
     transport = current_filter_->GetTransport();
-    if (transport == BluetoothDiscoveryFilter::Transport::TRANSPORT_LE) {
+    if (transport == BluetoothTransport::TRANSPORT_LE) {
       dbus_discovery_filter.transport.reset(new std::string("le"));
-    } else if (transport ==
-               BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC) {
+    } else if (transport == BluetoothTransport::TRANSPORT_CLASSIC) {
       dbus_discovery_filter.transport.reset(new std::string("bredr"));
-    } else if (transport ==
-               BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL) {
+    } else if (transport == BluetoothTransport::TRANSPORT_DUAL) {
       dbus_discovery_filter.transport.reset(new std::string("auto"));
     }
 
     current_filter_->GetUUIDs(uuids);
     if (uuids.size()) {
       dbus_discovery_filter.uuids = std::unique_ptr<std::vector<std::string>>(
           new std::vector<std::string>);
 
       for (const auto& it : uuids)
         dbus_discovery_filter.uuids.get()->push_back(it.value());
@@ skipping 225 matching lines @@
 
 void BluetoothAdapterBlueZ::RegisterApplicationOnError(
     const base::Closure& callback,
     const device::BluetoothGattService::ErrorCallback& error_callback,
     const std::string& /* error_name */,
     const std::string& /* error_message */) {
   RegisterApplication(callback, error_callback);
 }
 
 }  // namespace bluez