Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp

 // 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.
 
 #include "modules/bluetooth/BluetoothRemoteGATTCharacteristic.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMDataView.h"
@@ skipping 188 matching lines @@
 {
     WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptState);
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     webbluetooth->startNotifications(m_webCharacteristic->characteristicInstanceID, new CallbackPromiseAdapter<void, BluetoothError>(resolver));
     return promise;
 }
 
 ScriptPromise BluetoothRemoteGATTCharacteristic::stopNotifications(ScriptState* scriptState)
 {
-#if OS(MACOSX) || OS(ANDROID)
+#if OS(MACOSX)
     // TODO(jlebel): Remove when stopNotifications is implemented.
-    // TODO(scheib): Remove when stopNotifications is implemented.
     return ScriptPromise::rejectWithDOMException(scriptState,
         DOMException::create(NotSupportedError,
             "stopNotifications is not implemented yet. See https://goo.gl/J6ASzs"));
-#endif // OS(MACOSX) || OS(ANDROID)
+#endif // OS(MACOSX)
 
     WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptState);
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     webbluetooth->stopNotifications(m_webCharacteristic->characteristicInstanceID, new CallbackPromiseAdapter<void, BluetoothError>(resolver));
     return promise;
 }
 
 DEFINE_TRACE(BluetoothRemoteGATTCharacteristic)
 {
     visitor->trace(m_service);
     visitor->trace(m_properties);
     visitor->trace(m_value);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink