bluetooth: Add characteristics to the device's attribute instance map

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTService.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/BluetoothRemoteGATTService.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 58 matching lines @@
     // disconnected so we reject.
     if (!m_service->device()->gatt()->RemoveFromActiveAlgorithms(
             m_resolver.get())) {
       m_resolver->reject(
           DOMException::create(NetworkError, kGATTServerDisconnected));
       return;
     }
 
     if (m_quantity == mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE) {
       DCHECK_EQ(1u, webCharacteristics.size());
-      m_resolver->resolve(BluetoothRemoteGATTCharacteristic::take(
-          m_resolver, wrapUnique(webCharacteristics[0]), m_service));
+      m_resolver->resolve(
+          m_service->device()->getOrCreateBluetoothRemoteGATTCharacteristic(
+              m_resolver->getExecutionContext(),
+              wrapUnique(webCharacteristics[0]), m_service));
       return;
     }
 
     HeapVector<Member<BluetoothRemoteGATTCharacteristic>> characteristics;
     characteristics.reserveInitialCapacity(webCharacteristics.size());
     for (WebBluetoothRemoteGATTCharacteristicInit* webCharacteristic :
          webCharacteristics) {
-      characteristics.append(BluetoothRemoteGATTCharacteristic::take(
-          m_resolver, wrapUnique(webCharacteristic), m_service));
+      characteristics.append(
+          m_service->device()->getOrCreateBluetoothRemoteGATTCharacteristic(
+              m_resolver->getExecutionContext(), wrapUnique(webCharacteristic),
+              m_service));
     }
     m_resolver->resolve(characteristics);
   }
 
   void onError(
       int32_t
           error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
       override {
     if (!m_resolver->getExecutionContext() ||
         m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
@@ skipping 74 matching lines @@
       BluetoothSupplement::fromScriptState(scriptState);
   webbluetooth->getCharacteristics(
       m_webService->serviceInstanceID, static_cast<int32_t>(quantity),
       characteristicsUUID,
       new GetCharacteristicsCallback(this, quantity, resolver));
 
   return promise;
 }
 
 }  // namespace blink