| Index: device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
|
| diff --git a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
|
| similarity index 97%
|
| rename from chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
|
| rename to device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
|
| index e598322932e710330e36c161c0814b03a1b11642..e981124481fb4d4566750cd1820c734a534a0515 100644
|
| --- a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
|
| +++ b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
|
| @@ -2,20 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/dbus/bluetooth_le_advertisement_service_provider.h"
|
| +#include "device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/stl_util.h"
|
| #include "base/threading/platform_thread.h"
|
| -#include "chromeos/dbus/dbus_thread_manager.h"
|
| -#include "chromeos/dbus/fake_bluetooth_le_advertisement_service_provider.h"
|
| #include "dbus/exported_object.h"
|
| #include "dbus/message.h"
|
| +#include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| namespace {
|
| const char kErrorInvalidArgs[] = "org.freedesktop.DBus.Error.InvalidArgs";
|
| @@ -397,12 +397,10 @@ class BluetoothAdvertisementServiceProviderImpl
|
| };
|
|
|
| BluetoothLEAdvertisementServiceProvider::
|
| - BluetoothLEAdvertisementServiceProvider() {
|
| -}
|
| + BluetoothLEAdvertisementServiceProvider() {}
|
|
|
| BluetoothLEAdvertisementServiceProvider::
|
| - ~BluetoothLEAdvertisementServiceProvider() {
|
| -}
|
| + ~BluetoothLEAdvertisementServiceProvider() {}
|
|
|
| // static
|
| scoped_ptr<BluetoothLEAdvertisementServiceProvider>
|
| @@ -415,7 +413,7 @@ BluetoothLEAdvertisementServiceProvider::Create(
|
| scoped_ptr<ManufacturerData> manufacturer_data,
|
| scoped_ptr<UUIDList> solicit_uuids,
|
| scoped_ptr<ServiceData> service_data) {
|
| - if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
|
| + if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
|
| return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
|
| bus, object_path, delegate, type, service_uuids.Pass(),
|
| manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
|
| @@ -425,4 +423,4 @@ BluetoothLEAdvertisementServiceProvider::Create(
|
| }
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|