Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/bluetooth_gatt_service_client.h

 // 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.
 
-#ifndef CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
-#define CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
+#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
+#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "chromeos/chromeos_export.h"
-#include "chromeos/dbus/dbus_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
+#include "device/bluetooth/dbus/bluez_dbus_client.h"
 
-namespace chromeos {
+namespace bluez {
 
 // BluetoothGattServiceClient is used to communicate with remote GATT service
 // objects exposed by the Bluetooth daemon.
-class CHROMEOS_EXPORT BluetoothGattServiceClient : public DBusClient {
+class CHROMEOS_EXPORT BluetoothGattServiceClient : public BluezDBusClient {
  public:
   // Structure of properties associated with GATT services.
   struct Properties : public dbus::PropertySet {
     // The 128-bit service UUID. [read-only]
     dbus::Property<std::string> uuid;
 
     // Object path of the Bluetooth device that the GATT service belongs to.
     dbus::Property<dbus::ObjectPath> device;
 
     // Whether or not this service is a primary service.
     dbus::Property<bool> primary;
 
     // Array of object paths representing the characteristics of this service.
     // [read-only]
-    dbus::Property<std::vector<dbus::ObjectPath> > characteristics;
+    dbus::Property<std::vector<dbus::ObjectPath>> characteristics;
 
     // Array of object paths representing the included services of this service.
     // [read-only]
-    dbus::Property<std::vector<dbus::ObjectPath> > includes;
+    dbus::Property<std::vector<dbus::ObjectPath>> includes;
 
     Properties(dbus::ObjectProxy* object_proxy,
                const std::string& interface_name,
                const PropertyChangedCallback& callback);
     ~Properties() override;
   };
 
   // Interface for observing changes from a remote GATT service.
   class Observer {
    public:
@@ skipping 31 matching lines @@
   // Creates the instance.
   static BluetoothGattServiceClient* Create();
 
  protected:
   BluetoothGattServiceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattServiceClient);
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
-#endif  // CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
+#endif  // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_