Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm

 // 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.
 
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 #include "device/bluetooth/bluetooth_device_mac.h"
-#include "device/bluetooth/bluetooth_gatt_notify_session_mac.h"
+#include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_mac.h"
 
 namespace device {
 
 namespace {
 
 static BluetoothGattCharacteristic::Properties ConvertProperties(
     CBCharacteristicProperties cb_property) {
   BluetoothGattCharacteristic::Properties result =
       BluetoothGattCharacteristic::PROPERTY_NONE;
@@ skipping 103 matching lines @@
     const std::string& identifier) const {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void BluetoothRemoteGattCharacteristicMac::StartNotifySession(
     const NotifySessionCallback& callback,
     const ErrorCallback& error_callback) {
   if (IsNotifying()) {
     VLOG(2) << "Already notifying. Creating notify session.";
-    std::unique_ptr<BluetoothGattNotifySessionMac> notify_session(
-        new BluetoothGattNotifySessionMac(weak_ptr_factory_.GetWeakPtr()));
+    std::unique_ptr<BluetoothGattNotifySession> notify_session(
+        new BluetoothGattNotifySession(weak_ptr_factory_.GetWeakPtr()));
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(callback, base::Passed(std::move(notify_session))));
     return;
   }
 
   if (!SupportsNotificationsOrIndications()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(error_callback,
@@ skipping 67 matching lines @@
                              forCharacteristic:cb_characteristic_
                                           type:write_type];
   if (write_type == CBCharacteristicWriteWithoutResponse) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
                    base::Unretained(this), nil));
   }
 }
 
+void BluetoothRemoteGattCharacteristicMac::SubscribeToNotifications(
+    BluetoothRemoteGattDescriptor* ccc_descriptor,
+    const base::Closure& callback,
+    const ErrorCallback& error_callback) {
+  // TODO(http://crbug.com/633191): Implement this method
+  NOTIMPLEMENTED();
+}
+
+void BluetoothRemoteGattCharacteristicMac::UnsubscribeFromNotifications(
+    BluetoothRemoteGattDescriptor* ccc_descriptor,
+    const base::Closure& callback,
+    const ErrorCallback& error_callback) {
+  // TODO(http://crbug.com/633191): Implement this method
+  NOTIMPLEMENTED();
+}
+
 void BluetoothRemoteGattCharacteristicMac::DidUpdateValue(NSError* error) {
   // This method is called when the characteristic is read and when a
   // notification is received.
   if (characteristic_value_read_or_write_in_progress_) {
     std::pair<ValueCallback, ErrorCallback> callbacks;
     callbacks.swap(read_characteristic_value_callbacks_);
     characteristic_value_read_or_write_in_progress_ = false;
     if (error) {
       VLOG(1) << "Bluetooth error while reading for characteristic, domain: "
               << base::SysNSStringToUTF8(error.domain)
@@ skipping 63 matching lines @@
             << ", error code: " << error.code << ", localized description: "
             << base::SysNSStringToUTF8(error.localizedDescription);
     BluetoothGattService::GattErrorCode error_code =
         BluetoothDeviceMac::GetGattErrorCodeFromNSError(error);
     for (const auto& callback : reentrant_safe_callbacks) {
       callback.second.Run(error_code);
     }
     return;
   }
   for (const auto& callback : reentrant_safe_callbacks) {
-    callback.first.Run(base::MakeUnique<BluetoothGattNotifySessionMac>(
+    callback.first.Run(base::MakeUnique<BluetoothGattNotifySession>(
         weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 bool BluetoothRemoteGattCharacteristicMac::IsReadable() const {
   return GetProperties() & BluetoothGattCharacteristic::PROPERTY_READ;
 }
 
 bool BluetoothRemoteGattCharacteristicMac::IsWritable() const {
   BluetoothGattCharacteristic::Properties properties = GetProperties();
@@ skipping 12 matching lines @@
   return (GetProperties() & BluetoothGattCharacteristic::PROPERTY_WRITE)
              ? CBCharacteristicWriteWithResponse
              : CBCharacteristicWriteWithoutResponse;
 }
 
 CBCharacteristic* BluetoothRemoteGattCharacteristicMac::GetCBCharacteristic()
     const {
   return cb_characteristic_.get();
 }
 }  // namespace device.