Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/bluetooth_agent_manager_client.cc

Index: device/bluetooth/dbus/bluetooth_agent_manager_client.cc
diff --git a/chromeos/dbus/bluetooth_agent_manager_client.cc b/device/bluetooth/dbus/bluetooth_agent_manager_client.cc
similarity index 84%
rename from chromeos/dbus/bluetooth_agent_manager_client.cc
rename to device/bluetooth/dbus/bluetooth_agent_manager_client.cc
index af7bb16e2b2f15c596a2a9f0136cf2183b21c464..6caee9bd660e95d41e3216dba5e510bb920dcc4a 100644
--- a/chromeos/dbus/bluetooth_agent_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_agent_manager_client.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 "chromeos/dbus/bluetooth_agent_manager_client.h"
+#include "device/bluetooth/dbus/bluetooth_agent_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -11,14 +11,13 @@
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chromeos {
+namespace bluez {
 
 const char BluetoothAgentManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 // The BluetoothAgentManagerClient implementation used in production.
-class BluetoothAgentManagerClientImpl
-    : public BluetoothAgentManagerClient {
+class BluetoothAgentManagerClientImpl : public BluetoothAgentManagerClient {
  public:
   BluetoothAgentManagerClientImpl() : weak_ptr_factory_(this) {}
 
@@ -30,16 +29,15 @@ class BluetoothAgentManagerClientImpl
                      const base::Closure& callback,
                      const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
-    bluetooth_agent_manager::kBluetoothAgentManagerInterface,
-    bluetooth_agent_manager::kRegisterAgent);
+        bluetooth_agent_manager::kBluetoothAgentManagerInterface,
+        bluetooth_agent_manager::kRegisterAgent);
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendObjectPath(agent_path);
     writer.AppendString(capability);
 
     object_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothAgentManagerClientImpl::OnError,
@@ -58,15 +56,13 @@ class BluetoothAgentManagerClientImpl
     writer.AppendObjectPath(agent_path);
 
     object_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothAgentManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-
   // BluetoothAgentManagerClient override.
   void RequestDefaultAgent(const dbus::ObjectPath& agent_path,
                            const base::Closure& callback,
@@ -79,8 +75,7 @@ class BluetoothAgentManagerClientImpl
     writer.AppendObjectPath(agent_path);
 
     object_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothAgentManagerClientImpl::OnError,
@@ -98,8 +93,7 @@ class BluetoothAgentManagerClientImpl
 
  private:
   // Called when a response for successful method call is received.
-  void OnSuccess(const base::Closure& callback,
-                 dbus::Response* response) {
+  void OnSuccess(const base::Closure& callback, dbus::Response* response) {
     DCHECK(response);
     callback.Run();
   }
@@ -127,20 +121,17 @@ class BluetoothAgentManagerClientImpl
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<BluetoothAgentManagerClientImpl>
-      weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothAgentManagerClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAgentManagerClientImpl);
 };
 
-BluetoothAgentManagerClient::BluetoothAgentManagerClient() {
-}
+BluetoothAgentManagerClient::BluetoothAgentManagerClient() {}
 
-BluetoothAgentManagerClient::~BluetoothAgentManagerClient() {
-}
+BluetoothAgentManagerClient::~BluetoothAgentManagerClient() {}
 
 BluetoothAgentManagerClient* BluetoothAgentManagerClient::Create() {
   return new BluetoothAgentManagerClientImpl();
 }
 
-}  // namespace chromeos
+}  // namespace bluez