Add support for local services/characteristics/descriptors.

device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h

Index: device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h
index e46ddf9903974678918644e827f1c24e7e5d862b..6a5ff13c3d2d477e242f4154d0b847362406335e 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h
@@ -17,7 +17,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "dbus/object_path.h"
-#include "device/bluetooth/bluetooth_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_gatt_characteristic_bluez.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h"
 
@@ -30,35 +30,20 @@ class BluetoothGattService;
 
 namespace bluez {
 
-class BluetoothRemoteGattDescriptorBlueZ;
+class BluetoothGattDescriptorBlueZ;
 class BluetoothRemoteGattServiceBlueZ;
 
 // The BluetoothRemoteGattCharacteristicBlueZ class implements
 // BluetoothGattCharacteristic for remote GATT characteristics for platforms
 // that use BlueZ.
 class BluetoothRemoteGattCharacteristicBlueZ
-    : public device::BluetoothGattCharacteristic,
-      public bluez::BluetoothGattDescriptorClient::Observer {
+    : public BluetoothGattCharacteristicBlueZ,
+      public BluetoothGattDescriptorClient::Observer {
  public:
   // device::BluetoothGattCharacteristic overrides.
-  std::string GetIdentifier() const override;
-  device::BluetoothUUID GetUUID() const override;
   bool IsLocal() const override;
-  const std::vector<uint8_t>& GetValue() const override;
-  device::BluetoothGattService* GetService() const override;
-  Properties GetProperties() const override;
-  Permissions GetPermissions() const override;
-  bool IsNotifying() const override;
-  std::vector<device::BluetoothGattDescriptor*> GetDescriptors() const override;
-  device::BluetoothGattDescriptor* GetDescriptor(
-      const std::string& identifier) const override;
   bool AddDescriptor(device::BluetoothGattDescriptor* descriptor) override;
   bool UpdateValue(const std::vector<uint8_t>& value) override;
-  void ReadRemoteCharacteristic(const ValueCallback& callback,
-                                const ErrorCallback& error_callback) override;
-  void WriteRemoteCharacteristic(const std::vector<uint8_t>& new_value,
-                                 const base::Closure& callback,
-                                 const ErrorCallback& error_callback) override;
   void StartNotifySession(const NotifySessionCallback& callback,
                           const ErrorCallback& error_callback) override;
 
@@ -88,12 +73,6 @@ class BluetoothRemoteGattCharacteristicBlueZ
   void GattDescriptorPropertyChanged(const dbus::ObjectPath& object_path,
                                      const std::string& property_name) override;
 
-  // Called by dbus:: on unsuccessful completion of a request to read or write
-  // the characteristic value.
-  void OnError(const ErrorCallback& error_callback,
-               const std::string& error_name,
-               const std::string& error_message);
-
   // Called by dbus:: on successful completion of a request to start
   // notifications.
   void OnStartNotifySuccess(const NotifySessionCallback& callback);
@@ -137,7 +116,7 @@ class BluetoothRemoteGattCharacteristicBlueZ
   // this characteristic. Since the BlueZ implementation uses object paths
   // as unique identifiers, we also use this mapping to return descriptors by
   // identifier.
-  typedef std::map<dbus::ObjectPath, BluetoothRemoteGattDescriptorBlueZ*>
+  typedef std::map<dbus::ObjectPath, BluetoothGattDescriptorBlueZ*>
       DescriptorMap;
   DescriptorMap descriptors_;