Clean up web bluetooth related code

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 29 matching lines @@
     mojom::blink::WebBluetoothGATTQueryQuantity quantity,
     ScriptPromiseResolver* resolver,
     mojom::blink::WebBluetoothResult result,
     Optional<Vector<mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr>>
         characteristics) {
   if (!resolver->getExecutionContext() ||
       resolver->getExecutionContext()->isContextDestroyed())
     return;
 
   // If the device is disconnected, reject.
-  if (!device()->gatt()->RemoveFromActiveAlgorithms(resolver)) {
+  if (!m_device->gatt()->RemoveFromActiveAlgorithms(resolver)) {
     resolver->reject(BluetoothError::createDOMException(
         mojom::blink::WebBluetoothResult::
             GATT_SERVER_DISCONNECTED_WHILE_RETRIEVING_CHARACTERISTICS));
     return;
   }
 
   if (result == mojom::blink::WebBluetoothResult::SUCCESS) {
     DCHECK(characteristics);
 
     if (quantity == mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE) {
       DCHECK_EQ(1u, characteristics->size());
-      resolver->resolve(device()->getOrCreateRemoteGATTCharacteristic(
+      resolver->resolve(m_device->getOrCreateRemoteGATTCharacteristic(
           resolver->getExecutionContext(),
           std::move(characteristics.value()[0]), this));
       return;
     }
 
     HeapVector<Member<BluetoothRemoteGATTCharacteristic>> gattCharacteristics;
     gattCharacteristics.reserveInitialCapacity(characteristics->size());
     for (auto& characteristic : characteristics.value()) {
       gattCharacteristics.push_back(
-          device()->getOrCreateRemoteGATTCharacteristic(
+          m_device->getOrCreateRemoteGATTCharacteristic(
               resolver->getExecutionContext(), std::move(characteristic),
               this));
     }
     resolver->resolve(gattCharacteristics);
   } else {
     if (result == mojom::blink::WebBluetoothResult::CHARACTERISTIC_NOT_FOUND) {
       resolver->reject(BluetoothError::createDOMException(
           BluetoothErrorCode::CharacteristicNotFound,
           "No Characteristics matching UUID " + requestedCharacteristicUUID +
               " found in Service with UUID " + uuid() + "."));
@@ skipping 35 matching lines @@
     ScriptState* scriptState,
     ExceptionState&) {
   return getCharacteristicsImpl(
       scriptState, mojom::blink::WebBluetoothGATTQueryQuantity::MULTIPLE);
 }
 
 ScriptPromise BluetoothRemoteGATTService::getCharacteristicsImpl(
     ScriptState* scriptState,
     mojom::blink::WebBluetoothGATTQueryQuantity quantity,
     const String& characteristicsUUID) {
-  if (!device()->gatt()->connected()) {
+  if (!m_device->gatt()->connected()) {
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         BluetoothError::createDOMException(
             mojom::blink::WebBluetoothResult::
                 GATT_SERVER_NOT_CONNECTED_CANNOT_RETRIEVE_CHARACTERISTICS));
   }
 
-  if (!device()->isValidService(m_service->instance_id)) {
+  if (!m_device->isValidService(m_service->instance_id)) {
     return ScriptPromise::rejectWithDOMException(
         scriptState, BluetoothError::createDOMException(
                          BluetoothErrorCode::InvalidService,
                          "Service with UUID " + m_service->uuid +
                              " is no longer valid. Remember to retrieve "
                              "the service again after reconnecting."));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
-  device()->gatt()->AddToActiveAlgorithms(resolver);
+  m_device->gatt()->AddToActiveAlgorithms(resolver);
 
   mojom::blink::WebBluetoothService* service = m_device->bluetooth()->service();
   service->RemoteServiceGetCharacteristics(
       m_service->instance_id, quantity, characteristicsUUID,
       convertToBaseCallback(
           WTF::bind(&BluetoothRemoteGATTService::GetCharacteristicsCallback,
                     wrapPersistent(this), m_service->instance_id,
                     characteristicsUUID, quantity, wrapPersistent(resolver))));
 
   return promise;
 }
 
 }  // namespace blink