| Index: device/bluetooth/dbus/fake_bluetooth_media_client.cc
|
| diff --git a/chromeos/dbus/fake_bluetooth_media_client.cc b/device/bluetooth/dbus/fake_bluetooth_media_client.cc
|
| similarity index 86%
|
| rename from chromeos/dbus/fake_bluetooth_media_client.cc
|
| rename to device/bluetooth/dbus/fake_bluetooth_media_client.cc
|
| index 4c8f7fdfd38168246236c8c7bae5d02ea692017d..246a14097add6c61721cf220ec3ff3f767a302f8 100644
|
| --- a/chromeos/dbus/fake_bluetooth_media_client.cc
|
| +++ b/device/bluetooth/dbus/fake_bluetooth_media_client.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/dbus/fake_bluetooth_media_client.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_media_client.h"
|
|
|
| #include <string>
|
|
|
| #include "base/stl_util.h"
|
| -#include "chromeos/dbus/dbus_thread_manager.h"
|
| -#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
|
| -#include "chromeos/dbus/fake_bluetooth_media_endpoint_service_provider.h"
|
| -#include "chromeos/dbus/fake_bluetooth_media_transport_client.h"
|
| +#include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_media_endpoint_service_provider.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_media_transport_client.h"
|
|
|
| using dbus::ObjectPath;
|
|
|
| @@ -23,21 +23,18 @@ const char kInvalidArgumentsError[] = "org.chromium.Error.InvalidArguments";
|
|
|
| } // namespace
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // static
|
| const uint8_t FakeBluetoothMediaClient::kDefaultCodec = 0x00;
|
|
|
| FakeBluetoothMediaClient::FakeBluetoothMediaClient()
|
| : visible_(true),
|
| - object_path_(ObjectPath(FakeBluetoothAdapterClient::kAdapterPath)) {
|
| -}
|
| + object_path_(ObjectPath(FakeBluetoothAdapterClient::kAdapterPath)) {}
|
|
|
| -FakeBluetoothMediaClient::~FakeBluetoothMediaClient() {
|
| -}
|
| +FakeBluetoothMediaClient::~FakeBluetoothMediaClient() {}
|
|
|
| -void FakeBluetoothMediaClient::Init(dbus::Bus* bus) {
|
| -}
|
| +void FakeBluetoothMediaClient::Init(dbus::Bus* bus) {}
|
|
|
| void FakeBluetoothMediaClient::AddObserver(
|
| BluetoothMediaClient::Observer* observer) {
|
| @@ -122,7 +119,7 @@ void FakeBluetoothMediaClient::SetEndpointRegistered(
|
| // transport.
|
| FakeBluetoothMediaTransportClient* transport =
|
| static_cast<FakeBluetoothMediaTransportClient*>(
|
| - DBusThreadManager::Get()->GetBluetoothMediaTransportClient());
|
| + bluez::BluezDBusManager::Get()->GetBluetoothMediaTransportClient());
|
| transport->SetValid(endpoint, false);
|
|
|
| endpoints_.erase(endpoint->object_path());
|
| @@ -134,4 +131,4 @@ bool FakeBluetoothMediaClient::IsRegistered(
|
| return ContainsKey(endpoints_, endpoint_path);
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|