| Index: device/bluetooth/bluetooth_device_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
|
| similarity index 97%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc
|
| rename to device/bluetooth/bluetooth_device_chromeos.cc
|
| index aa060d5d011db666f892db523f06a173cfedddfb..2a09cac150fee814232e94c1ac8e062947b2db85 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc
|
| +++ b/device/bluetooth/bluetooth_device_chromeos.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h"
|
| +#include "device/bluetooth/bluetooth_device_chromeos.h"
|
|
|
| #include <map>
|
| #include <string>
|
| @@ -16,22 +16,27 @@
|
| #include "base/string16.h"
|
| #include "base/string_util.h"
|
| #include "base/values.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
|
| #include "chromeos/dbus/bluetooth_adapter_client.h"
|
| #include "chromeos/dbus/bluetooth_agent_service_provider.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "chromeos/dbus/bluetooth_input_client.h"
|
| #include "chromeos/dbus/bluetooth_out_of_band_client.h"
|
| -#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/introspectable_client.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_adapter_chromeos.h"
|
| +#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
|
| +#include "device/bluetooth/bluetooth_service_record.h"
|
| +#include "device/bluetooth/bluetooth_socket_chromeos.h"
|
| +#include "device/bluetooth/bluetooth_utils.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| +using device::BluetoothDevice;
|
| +using device::BluetoothOutOfBandPairingData;
|
| +using device::BluetoothServiceRecord;
|
| +using device::BluetoothSocket;
|
| +
|
| namespace chromeos {
|
|
|
| BluetoothDeviceChromeOs::BluetoothDeviceChromeOs(
|
| @@ -74,7 +79,7 @@ bool BluetoothDeviceChromeOs::ProvidesServiceWithUUID(
|
| for (BluetoothDevice::ServiceList::const_iterator iter = services.begin();
|
| iter != services.end();
|
| ++iter) {
|
| - if (bluetooth_utils::CanonicalUuid(*iter) == uuid)
|
| + if (device::bluetooth_utils::CanonicalUuid(*iter) == uuid)
|
| return true;
|
| }
|
| return false;
|
| @@ -259,7 +264,7 @@ void BluetoothDeviceChromeOs::ConnectToService(const std::string& service_uuid,
|
| }
|
|
|
| void BluetoothDeviceChromeOs::SetOutOfBandPairingData(
|
| - const chromeos::BluetoothOutOfBandPairingData& data,
|
| + const BluetoothOutOfBandPairingData& data,
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) {
|
| DBusThreadManager::Get()->GetBluetoothOutOfBandClient()->
|
|
|