bluetooth: Reject with NetworkError when disconnected during getPrimaryService(s)

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.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/BluetoothRemoteGATTServer.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 144 matching lines @@
   }
 
   void onError(
       int32_t
           error /* Corresponds to WebBluetoothError in web_bluetooth.mojom */)
       override {
     if (!m_resolver->getExecutionContext() ||
         m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
       return;
 
-    m_device->gatt()->RemoveFromActiveAlgorithms(m_resolver.get());
+    if (!m_device->gatt()->RemoveFromActiveAlgorithms(m_resolver.get())) {
+      m_resolver->reject(
+          DOMException::create(NetworkError, kGATTServerDisconnected));
+      return;
+    }
+
     m_resolver->reject(BluetoothError::take(m_resolver, error));
   }
 
  private:
   Persistent<BluetoothDevice> m_device;
   mojom::blink::WebBluetoothGATTQueryQuantity m_quantity;
-  Persistent<ScriptPromiseResolver> m_resolver;
+  const Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 ScriptPromise BluetoothRemoteGATTServer::getPrimaryService(
     ScriptState* scriptState,
     const StringOrUnsignedLong& service,
     ExceptionState& exceptionState) {
   String serviceUUID = BluetoothUUID::getService(service, exceptionState);
   if (exceptionState.hadException())
     return exceptionState.reject(scriptState);
 
@@ skipping 38 matching lines @@
   WebBluetooth* webbluetooth =
       BluetoothSupplement::fromScriptState(scriptState);
   webbluetooth->getPrimaryServices(
       device()->id(), static_cast<int32_t>(quantity), servicesUUID,
       new GetPrimaryServicesCallback(device(), quantity, resolver));
 
   return promise;
 }
 
 }  // namespace blink