Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/bluetooth_input_client.cc

 // Copyright 2013 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_input_client.h"
+#include "device/bluetooth/dbus/bluetooth_input_client.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chromeos {
+namespace bluez {
 
 BluetoothInputClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
     : dbus::PropertySet(object_proxy, interface_name, callback) {
   RegisterProperty(bluetooth_input::kReconnectModeProperty, &reconnect_mode);
 }
 
-BluetoothInputClient::Properties::~Properties() {
-}
-
+BluetoothInputClient::Properties::~Properties() {}
 
 // The BluetoothInputClient implementation used in production.
-class BluetoothInputClientImpl
-    : public BluetoothInputClient,
-      public dbus::ObjectManager::Interface {
+class BluetoothInputClientImpl : public BluetoothInputClient,
+                                 public dbus::ObjectManager::Interface {
  public:
   BluetoothInputClientImpl() : object_manager_(NULL), weak_ptr_factory_(this) {}
 
   ~BluetoothInputClientImpl() override {
     object_manager_->UnregisterInterface(
         bluetooth_input::kBluetoothInputInterface);
   }
 
   // BluetoothInputClient override.
   void AddObserver(BluetoothInputClient::Observer* observer) override {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // BluetoothInputClient override.
   void RemoveObserver(BluetoothInputClient::Observer* observer) override {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   // dbus::ObjectManager::Interface override.
   dbus::PropertySet* CreateProperties(
       dbus::ObjectProxy* object_proxy,
       const dbus::ObjectPath& object_path,
       const std::string& interface_name) override {
-    Properties* properties = new Properties(
-        object_proxy,
-        interface_name,
-        base::Bind(&BluetoothInputClientImpl::OnPropertyChanged,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   object_path));
+    Properties* properties =
+        new Properties(object_proxy, interface_name,
+                       base::Bind(&BluetoothInputClientImpl::OnPropertyChanged,
+                                  weak_ptr_factory_.GetWeakPtr(), object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
   // BluetoothInputClient override.
   Properties* GetProperties(const dbus::ObjectPath& object_path) override {
-    return static_cast<Properties*>(
-        object_manager_->GetProperties(
-            object_path,
-            bluetooth_input::kBluetoothInputInterface));
+    return static_cast<Properties*>(object_manager_->GetProperties(
+        object_path, bluetooth_input::kBluetoothInputInterface));
   }
 
  protected:
   void Init(dbus::Bus* bus) override {
     object_manager_ = bus->GetObjectManager(
         bluetooth_object_manager::kBluetoothObjectManagerServiceName,
         dbus::ObjectPath(
             bluetooth_object_manager::kBluetoothObjectManagerServicePath));
     object_manager_->RegisterInterface(
         bluetooth_input::kBluetoothInputInterface, this);
@@ skipping 32 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<BluetoothInputClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothInputClientImpl);
 };
 
-BluetoothInputClient::BluetoothInputClient() {
-}
+BluetoothInputClient::BluetoothInputClient() {}
 
-BluetoothInputClient::~BluetoothInputClient() {
-}
+BluetoothInputClient::~BluetoothInputClient() {}
 
 BluetoothInputClient* BluetoothInputClient::Create() {
   return new BluetoothInputClientImpl();
 }
 
-}  // namespace chromeos
+}  // namespace bluez