Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/fake_bluetooth_media_client.cc

 // Copyright 2014 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 "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;
 
 namespace {
 
 // Except for |kFailedError|, the other error is defined in BlueZ D-Bus Media
 // API.
 const char kFailedError[] = "org.chromium.Error.Failed";
 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) {
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void FakeBluetoothMediaClient::RemoveObserver(
     BluetoothMediaClient::Observer* observer) {
   DCHECK(observer);
@@ skipping 64 matching lines @@
     return;
   }
 
   if (!IsRegistered(endpoint->object_path()))
     return;
 
   // Once a media endpoint object becomes invalid, invalidate the associated
   // transport.
   FakeBluetoothMediaTransportClient* transport =
       static_cast<FakeBluetoothMediaTransportClient*>(
-          DBusThreadManager::Get()->GetBluetoothMediaTransportClient());
+          bluez::BluezDBusManager::Get()->GetBluetoothMediaTransportClient());
   transport->SetValid(endpoint, false);
 
   endpoints_.erase(endpoint->object_path());
   endpoint->Released();
 }
 
 bool FakeBluetoothMediaClient::IsRegistered(
     const dbus::ObjectPath& endpoint_path) {
   return ContainsKey(endpoints_, endpoint_path);
 }
 
-}  // namespace chromeos
+}  // namespace bluez