Clean up web bluetooth related code

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/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/events/Event.h"
@@ skipping 362 matching lines @@
     mojom::blink::WebBluetoothGATTQueryQuantity quantity,
     ScriptPromiseResolver* resolver,
     mojom::blink::WebBluetoothResult result,
     Optional<Vector<mojom::blink::WebBluetoothRemoteGATTDescriptorPtr>>
         descriptors) {
   if (!resolver->getExecutionContext() ||
       resolver->getExecutionContext()->isContextDestroyed())
     return;
 
   // If the device is disconnected, reject.
-  if (!service()->device()->gatt()->RemoveFromActiveAlgorithms(resolver)) {
+  if (!m_service->device()->gatt()->RemoveFromActiveAlgorithms(resolver)) {
     resolver->reject(BluetoothError::createDOMException(
         blink::mojom::WebBluetoothResult::GATT_SERVER_DISCONNECTED));
     return;
   }
 
   if (result == mojom::blink::WebBluetoothResult::SUCCESS) {
     DCHECK(descriptors);
 
     if (quantity == mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE) {
       DCHECK_EQ(1u, descriptors->size());
       resolver->resolve(
-          service()->device()->getOrCreateBluetoothRemoteGATTDescriptor(
+          m_service->device()->getOrCreateBluetoothRemoteGATTDescriptor(
               std::move(descriptors.value()[0]), this));
       return;
     }
 
     HeapVector<Member<BluetoothRemoteGATTDescriptor>> gattDescriptors;
     gattDescriptors.reserveInitialCapacity(descriptors->size());
     for (auto& descriptor : descriptors.value()) {
       gattDescriptors.push_back(
-          service()->device()->getOrCreateBluetoothRemoteGATTDescriptor(
+          m_service->device()->getOrCreateBluetoothRemoteGATTDescriptor(
               std::move(descriptor), this));
     }
     resolver->resolve(gattDescriptors);
   } else {
     if (result == mojom::blink::WebBluetoothResult::DESCRIPTOR_NOT_FOUND) {
       resolver->reject(BluetoothError::createDOMException(
           BluetoothErrorCode::DescriptorNotFound,
           "No Descriptors matching UUID " + requestedDescriptorUUID +
               " found in Characteristic with UUID " + uuid() + "."));
     } else {
@@ skipping 14 matching lines @@
 DEFINE_TRACE(BluetoothRemoteGATTCharacteristic) {
   visitor->trace(m_service);
   visitor->trace(m_properties);
   visitor->trace(m_value);
   visitor->trace(m_device);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink