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

device/bluetooth/bluetooth_local_gatt_service.h

Index: device/bluetooth/bluetooth_local_gatt_service.h
diff --git a/device/bluetooth/bluetooth_gatt_service.h b/device/bluetooth/bluetooth_local_gatt_service.h
similarity index 57%
copy from device/bluetooth/bluetooth_gatt_service.h
copy to device/bluetooth/bluetooth_local_gatt_service.h
index d058762c728c78175da7edc4629fcb695b539c94..62e246a63e11c22298c50ab4e0397b089b3777d5 100644
--- a/device/bluetooth/bluetooth_gatt_service.h
+++ b/device/bluetooth/bluetooth_local_gatt_service.h
@@ -1,41 +1,40 @@
-// 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_SERVICE_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_GATT_SERVICE_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_
 
 #include <stdint.h>
-#include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "device/bluetooth/bluetooth_export.h"
+#include "device/bluetooth/bluetooth_gatt_service.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace device {
 
 class BluetoothDevice;
-class BluetoothGattCharacteristic;
-class BluetoothGattDescriptor;
+class BluetoothRemoteGattCharacteristic;
+class BluetoothRemoteGattDescriptor;
 
-// BluetoothGattService represents a local or remote GATT service. A GATT
-// service is hosted by a peripheral and represents a collection of data in
-// the form of GATT characteristics and a set of included GATT services if this
-// service is what is called "a primary service".
+// BluetoothLocalGattService represents a local  GATT service.

[scheib, 2016/04/20 01:23:30]

"  " -> " "

[rkc, 2016/04/20 16:31:54]

Done.

 //
-// Instances of the BluetoothGattService class are used for two functions:
-//   1. To represent GATT attribute hierarchies that have been received from a
-//      remote Bluetooth GATT peripheral. Such BluetoothGattService instances
-//      are constructed and owned by a BluetoothDevice.
+// Instances of the BluetoothLocalGattService class are used to represent a
+// locally hosted GATT attribute hierarchy when the local
+// adapter is used in the "peripheral" role. Such instances are meant to be
+// constructed directly and registered. Once registered, a GATT attribute
+// hierarchy will be visible to remote devices in the "central" role.
 //
-//   2. To represent a locally hosted GATT attribute hierarchy when the local
-//      adapter is used in the "peripheral" role. Such instances are meant to be
-//      constructed directly and registered. Once registered, a GATT attribute
-//      hierarchy will be visible to remote devices in the "central" role.
-class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
+// Note: We use virtual inheritance on the gatt service since it will be
+// inherited by platform specific versions of the gatt service classes also. The
+// platform specific local gatt service classes will inherit both this class and
+// their gatt service class, hence causing an inheritance diamond.
+class DEVICE_BLUETOOTH_EXPORT BluetoothLocalGattService
+    : public virtual BluetoothGattService {
  public:
   // The Delegate class is used to send certain events that need to be handled
   // when the device is in peripheral mode. The delegate handles read and write
@@ -60,8 +59,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnCharacteristicReadRequest(
-        const BluetoothGattService* service,
-        const BluetoothGattCharacteristic* characteristic,
+        const BluetoothLocalGattService* service,
+        const BluetoothRemoteGattCharacteristic* characteristic,

[scheib, 2016/04/20 01:23:30]

Local Characteristic (and several more below)

[rkc, 2016/04/20 16:31:54]

Done.

         int offset,
         const ValueCallback& callback,
         const ErrorCallback& error_callback) = 0;
@@ -80,8 +79,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnCharacteristicWriteRequest(
-        const BluetoothGattService* service,
-        const BluetoothGattCharacteristic* characteristic,
+        const BluetoothLocalGattService* service,
+        const BluetoothRemoteGattCharacteristic* characteristic,
         const std::vector<uint8_t>& value,
         int offset,
         const ValueCallback& callback,
@@ -101,8 +100,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnDescriptorReadRequest(
-        const BluetoothGattService* service,
-        const BluetoothGattDescriptor* descriptor,
+        const BluetoothLocalGattService* service,
+        const BluetoothRemoteGattDescriptor* descriptor,
         int offset,
         const ValueCallback& callback,
         const ErrorCallback& error_callback) = 0;
@@ -121,33 +120,18 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnDescriptorWriteRequest(
-        const BluetoothGattService* service,
-        const BluetoothGattDescriptor* descriptor,
+        const BluetoothLocalGattService* service,
+        const BluetoothRemoteGattDescriptor* descriptor,
         const std::vector<uint8_t>& value,
         int offset,
         const ValueCallback& callback,
         const ErrorCallback& error_callback) = 0;
   };
 
-  // Interacting with Characteristics and Descriptors can produce
-  // this set of errors.
-  enum GattErrorCode {
-    GATT_ERROR_UNKNOWN = 0,
-    GATT_ERROR_FAILED,
-    GATT_ERROR_IN_PROGRESS,
-    GATT_ERROR_INVALID_LENGTH,
-    GATT_ERROR_NOT_PERMITTED,
-    GATT_ERROR_NOT_AUTHORIZED,
-    GATT_ERROR_NOT_PAIRED,
-    GATT_ERROR_NOT_SUPPORTED
-  };
-
-  // The ErrorCallback is used by methods to asynchronously report errors.
-  using ErrorCallback = base::Callback<void(GattErrorCode error_code)>;
-
-  virtual ~BluetoothGattService();
+  ~BluetoothLocalGattService() override;
 
-  // Constructs a BluetoothGattService that can be locally hosted when the local
+  // Constructs a BluetoothLocalGattService that can be locally hosted when the
+  // local

[scheib, 2016/04/20 01:23:30]

wrapping

[rkc, 2016/04/20 16:31:54]

Done.

   // adapter is in the peripheral role. The resulting object can then be made
   // available by calling the "Register" method. This method constructs a
   // service with UUID |uuid|. Whether the constructed service is primary or
@@ -155,57 +139,12 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
   // peripheral role events. If |delegate| is NULL, then this service will
   // employ a default behavior when responding to read and write requests based
   // on the cached value of its characteristics and descriptors at a given time.
-  static BluetoothGattService* Create(const BluetoothUUID& uuid,
-                                      bool is_primary,
-                                      Delegate* delegate);
-
-  // Identifier used to uniquely identify a GATT service object. This is
-  // different from the service UUID: while multiple services with the same UUID
-  // can exist on a Bluetooth device, the identifier returned from this method
-  // is unique among all services on the adapter. The contents of the identifier
-  // are platform specific.
-  virtual std::string GetIdentifier() const = 0;
-
-  // The Bluetooth-specific UUID of the service.
-  virtual BluetoothUUID GetUUID() const = 0;
-
-  // Returns true, if this service hosted locally. If false, then this service
-  // represents a remote GATT service.
-  virtual bool IsLocal() const = 0;
-
-  // Indicates whether the type of this service is primary or secondary. A
-  // primary service describes the primary function of the peripheral that
-  // hosts it, while a secondary service only makes sense in the presence of a
-  // primary service. A primary service may include other primary or secondary
-  // services.
-  virtual bool IsPrimary() const = 0;
-
-  // Returns the BluetoothDevice that this GATT service was received from, which
-  // also owns this service. Local services always return NULL.
-  virtual BluetoothDevice* GetDevice() const = 0;
-
-  // List of characteristics that belong to this service.
-  virtual std::vector<BluetoothGattCharacteristic*>
-      GetCharacteristics() const = 0;
-
-  // List of GATT services that are included by this service.
-  virtual std::vector<BluetoothGattService*>
-      GetIncludedServices() const = 0;
-
-  // Returns the GATT characteristic with identifier |identifier| if it belongs
-  // to this GATT service.
-  virtual BluetoothGattCharacteristic* GetCharacteristic(
-      const std::string& identifier) const = 0;
-
-  // Adds characteristics and included services to the local attribute hierarchy
-  // represented by this service. These methods only make sense for local
-  // services and won't have an effect if this instance represents a remote
-  // GATT service and will return false. While ownership of added
-  // characteristics are taken over by the service, ownership of an included
-  // service is not taken.
-  virtual bool AddCharacteristic(
-      BluetoothGattCharacteristic* characteristic) = 0;
-  virtual bool AddIncludedService(BluetoothGattService* service) = 0;
+  // TODO(rkc): Implement included services.
+  static BluetoothLocalGattService* Create(
+      const BluetoothUUID& uuid,
+      bool is_primary,
+      BluetoothLocalGattService* included_service,
+      Delegate* delegate);
 
   // Registers this GATT service. Calling Register will make this service and
   // all of its associated attributes available on the local adapters GATT
@@ -222,12 +161,12 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattService {
                           const ErrorCallback& error_callback) = 0;
 
  protected:
-  BluetoothGattService();
+  BluetoothLocalGattService();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(BluetoothGattService);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothLocalGattService);
 };
 
 }  // namespace device
 
-#endif  // DEVICE_BLUETOOTH_BLUETOOTH_GATT_SERVICE_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_