Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

 // Copyright 2015 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_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 43 matching lines @@
   // Returns the associated ChromeBluetoothRemoteGattCharacteristic Java object.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
   // BluetoothRemoteGattCharacteristic interface:
   std::string GetIdentifier() const override;
   BluetoothUUID GetUUID() const override;
   const std::vector<uint8_t>& GetValue() const override;
   BluetoothRemoteGattService* GetService() const override;
   Properties GetProperties() const override;
   Permissions GetPermissions() const override;
-  bool IsNotifying() const override;
   std::vector<BluetoothRemoteGattDescriptor*> GetDescriptors() const override;
   BluetoothRemoteGattDescriptor* GetDescriptor(
       const std::string& identifier) const override;
-  void StartNotifySession(const NotifySessionCallback& callback,
-                          const ErrorCallback& error_callback) 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;
 
-  // Called when StartNotifySession operation succeeds.
-  void OnStartNotifySessionSuccess();
-
-  // Called when StartNotifySession operation fails.
-  void OnStartNotifySessionError(
-      BluetoothRemoteGattService::GattErrorCode error);
-
   // Called when value changed event occurs.
   void OnChanged(JNIEnv* env,
                  const base::android::JavaParamRef<jobject>& jcaller,
                  const base::android::JavaParamRef<jbyteArray>& value);
 
   // Called when Read operation completes.
   void OnRead(JNIEnv* env,
               const base::android::JavaParamRef<jobject>& jcaller,
               int32_t status,
               const base::android::JavaParamRef<jbyteArray>& value);
 
   // Called when Write operation completes.
   void OnWrite(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& jcaller,
                int32_t status);
 
   // Creates a Bluetooth GATT descriptor object and adds it to |descriptors_|,
   // DCHECKing that it has not already been created.
   void CreateGattRemoteDescriptor(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& caller,
       const base::android::JavaParamRef<jstring>& instanceId,
       const base::android::JavaParamRef<
           jobject>& /* BluetoothGattDescriptorWrapper */
       bluetooth_gatt_descriptor_wrapper,
       const base::android::JavaParamRef<
           jobject>& /* ChromeBluetoothCharacteristic */
       chrome_bluetooth_characteristic);
 
+ protected:
+  void SubscribeToNotifications(BluetoothRemoteGattDescriptor* ccc_descriptor,
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback) override;
+  void UnsubscribeFromNotifications(
+      BluetoothRemoteGattDescriptor* ccc_descriptor,
+      const base::Closure& callback,
+      const ErrorCallback& error_callback) override;
+
  private:
   BluetoothRemoteGattCharacteristicAndroid(
       BluetoothAdapterAndroid* adapter,
       BluetoothRemoteGattServiceAndroid* service,
       const std::string& instance_id);
 
   // Populates |descriptors_| from Java objects if necessary.
   void EnsureDescriptorsCreated() const;
 
   // The adapter and service associated with this characteristic. It's ok to
   // store a raw pointers here since they indirectly own this instance.
   BluetoothAdapterAndroid* adapter_;
   BluetoothRemoteGattServiceAndroid* service_;
 
   // Java object
   // org.chromium.device.bluetooth.ChromeBluetoothRemoteGattCharacteristic.
   base::android::ScopedJavaGlobalRef<jobject> j_characteristic_;
 
   // Adapter unique instance ID.
   std::string instance_id_;
 
-  // StartNotifySession callbacks and pending state.
-  typedef std::pair<NotifySessionCallback, ErrorCallback>
-      PendingStartNotifyCall;
-  std::vector<PendingStartNotifyCall> pending_start_notify_calls_;
-
   // ReadRemoteCharacteristic callbacks and pending state.
   bool read_pending_ = false;
   ValueCallback read_callback_;
   ErrorCallback read_error_callback_;
 
   // WriteRemoteCharacteristic callbacks and pending state.
   bool write_pending_ = false;
   base::Closure write_callback_;
   ErrorCallback write_error_callback_;
 
   std::vector<uint8_t> value_;
 
   // Map of descriptors, keyed by descriptor identifier.
   base::ScopedPtrHashMap<std::string,
                          std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>>
       descriptors_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_