Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/bluetooth_gatt_manager_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/bluetooth_gatt_manager_client.h"
+#include "device/bluetooth/dbus/bluetooth_gatt_manager_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chromeos {
+namespace bluez {
 
 const char BluetoothGattManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 // The BluetoothGattManagerClient implementation used in production.
 class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient {
  public:
   BluetoothGattManagerClientImpl()
-      : object_proxy_(NULL),
-        weak_ptr_factory_(this) {
-  }
+      : object_proxy_(NULL), weak_ptr_factory_(this) {}
 
   ~BluetoothGattManagerClientImpl() override {}
 
   // BluetoothGattManagerClient override.
   void RegisterService(const dbus::ObjectPath& service_path,
                        const Options& options,
                        const base::Closure& callback,
                        const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_gatt_manager::kBluetoothGattManagerInterface,
         bluetooth_gatt_manager::kRegisterService);
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendObjectPath(service_path);
 
     // TODO(armansito): The parameters of the Options dictionary are undefined
     // but the method signature still requires a value dictionary. Pass an
     // empty dictionary and fill in the contents later once this is defined.
     dbus::MessageWriter array_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
     writer.CloseContainer(&array_writer);
 
     DCHECK(object_proxy_);
     object_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothGattManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothGattManagerClient override.
   void UnregisterService(const dbus::ObjectPath& service_path,
                          const base::Closure& callback,
                          const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_gatt_manager::kBluetoothGattManagerInterface,
         bluetooth_gatt_manager::kUnregisterService);
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendObjectPath(service_path);
 
     DCHECK(object_proxy_);
     object_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothGattManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
  protected:
   // chromeos::DBusClient override.
   void Init(dbus::Bus* bus) override {
     DCHECK(bus);
@@ skipping 31 matching lines @@
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // 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<BluetoothGattManagerClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattManagerClientImpl);
 };
 
-BluetoothGattManagerClient::BluetoothGattManagerClient() {
-}
+BluetoothGattManagerClient::BluetoothGattManagerClient() {}
 
-BluetoothGattManagerClient::~BluetoothGattManagerClient() {
-}
+BluetoothGattManagerClient::~BluetoothGattManagerClient() {}
 
 // static
 BluetoothGattManagerClient* BluetoothGattManagerClient::Create() {
   return new BluetoothGattManagerClientImpl();
 }
 
-}  // namespace chromeos
+}  // namespace bluez