Refactor device::BluetoothGattXXX classes to split into remote/local.

device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h

Index: device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h
diff --git a/device/bluetooth/bluetooth_gatt_descriptor_bluez.h b/device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h
similarity index 33%
copy from device/bluetooth/bluetooth_gatt_descriptor_bluez.h
copy to device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h
index 388cf8b7cbfbb7767934f28074742f36a6d5f346..c079b0027466ad2bf12c552e4c030ce6f7353d49 100644
--- a/device/bluetooth/bluetooth_gatt_descriptor_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h
@@ -1,61 +1,36 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 DEVICE_BLUETOOTH_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_
-
-#include <stdint.h>
+#ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_
 
 #include <string>
-#include <vector>
 
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_gatt_descriptor.h"
-#include "device/bluetooth/bluetooth_uuid.h"
-
-namespace device {
-
-class BluetoothGattCharacteristic;
-
-}  // namespace device
 
 namespace bluez {
 
 class BluetoothGattCharacteristicBlueZ;
 
-// The BluetoothGattDescriptorBlueZ class implements
-// BluetoothGattDescriptor for remote and local GATT characteristic descriptors
-// for platforms that use BlueZ.
-class BluetoothGattDescriptorBlueZ : public device::BluetoothGattDescriptor {
+// The BluetoothGattDescriptorBlueZ class implements BluetoothGattDescriptor for
+// GATT characteristic descriptors for platforms that use BlueZ.
+class BluetoothGattDescriptorBlueZ
+    : public virtual device::BluetoothGattDescriptor {
  public:
   // device::BluetoothGattDescriptor overrides.
   std::string GetIdentifier() const override;
-  device::BluetoothUUID GetUUID() const override;
-  bool IsLocal() const override;
-  const std::vector<uint8_t>& GetValue() const override;
-  device::BluetoothGattCharacteristic* GetCharacteristic() const override;
-  device::BluetoothGattCharacteristic::Permissions GetPermissions()
-      const override;
-  void ReadRemoteDescriptor(const ValueCallback& callback,
-                            const ErrorCallback& error_callback) override;
-  void WriteRemoteDescriptor(const std::vector<uint8_t>& new_value,
-                             const base::Closure& callback,
-                             const ErrorCallback& error_callback) override;
 
   // Object path of the underlying D-Bus characteristic.
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
- private:
-  friend class BluetoothRemoteGattCharacteristicBlueZ;
-
-  BluetoothGattDescriptorBlueZ(BluetoothGattCharacteristicBlueZ* characteristic,
-                               const dbus::ObjectPath& object_path,
-                               bool is_local);
+ protected:
+  explicit BluetoothGattDescriptorBlueZ(const dbus::ObjectPath& object_path);
   ~BluetoothGattDescriptorBlueZ() override;
 
+ private:
   // Called by dbus:: on unsuccessful completion of a request to read or write
   // the descriptor value.
   void OnError(const ErrorCallback& error_callback,
@@ -65,19 +40,9 @@ class BluetoothGattDescriptorBlueZ : public device::BluetoothGattDescriptor {
   // Object path of the D-Bus descriptor object.
   dbus::ObjectPath object_path_;
 
-  // The GATT characteristic this descriptor belongs to.
-  BluetoothGattCharacteristicBlueZ* characteristic_;
-
-  // Is this a remote or local descriptor.
-  bool is_local_;
-
-  // 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<BluetoothGattDescriptorBlueZ> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattDescriptorBlueZ);
 };
 
 }  // namespace bluez
 
-#endif  // DEVICE_BLUETOOTH_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_
+#endif  // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_GATT_DESCRIPTOR_BLUEZ_H_