Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

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

 // Copyright 2014 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/BluetoothDevice.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/events/Event.h"
 #include "modules/bluetooth/Bluetooth.h"
 #include "modules/bluetooth/BluetoothAttributeInstanceMap.h"
 #include "modules/bluetooth/BluetoothError.h"
 #include "modules/bluetooth/BluetoothRemoteGATTServer.h"
 #include <memory>
 #include <utility>
 
 namespace blink {
 
 BluetoothDevice::BluetoothDevice(ExecutionContext* context,
                                  mojom::blink::WebBluetoothDevicePtr device,
                                  Bluetooth* bluetooth)
     : ContextLifecycleObserver(context),
       m_attributeInstanceMap(new BluetoothAttributeInstanceMap(this)),
       m_device(std::move(device)),
-      m_gatt(BluetoothRemoteGATTServer::Create(this)),
+      m_gatt(BluetoothRemoteGATTServer::Create(context, this)),
       m_bluetooth(bluetooth) {}
 
 // static
 BluetoothDevice* BluetoothDevice::take(
     ScriptPromiseResolver* resolver,
     mojom::blink::WebBluetoothDevicePtr device,
     Bluetooth* bluetooth) {
   return new BluetoothDevice(resolver->getExecutionContext(), std::move(device),
                              bluetooth);
 }
@@ skipping 30 matching lines @@
     mojom::blink::WebBluetoothRemoteGATTDescriptorPtr descriptor,
     BluetoothRemoteGATTCharacteristic* characteristic) {
   return m_attributeInstanceMap->GetOrCreateBluetoothRemoteGATTDescriptor(
       std::move(descriptor), characteristic);
 }
 
 bool BluetoothDevice::IsValidDescriptor(const String& descriptorInstanceId) {
   return m_attributeInstanceMap->ContainsDescriptor(descriptorInstanceId);
 }
 
-void BluetoothDevice::Dispose() {
-  DisconnectGATTIfConnected();
-}
-
-void BluetoothDevice::contextDestroyed(ExecutionContext*) {
-  DisconnectGATTIfConnected();
-}
-
-void BluetoothDevice::DisconnectGATTIfConnected() {
-  if (m_gatt->connected()) {
-    m_gatt->SetConnected(false);
-    m_gatt->ClearActiveAlgorithms();
-    m_bluetooth->RemoveFromConnectedDevicesMap(id());
-    mojom::blink::WebBluetoothService* service = m_bluetooth->Service();
-    service->RemoteServerDisconnect(id());
-  }
-}
-
-void BluetoothDevice::CleanupDisconnectedDeviceAndFireEvent() {
-  DCHECK(m_gatt->connected());
-  m_gatt->SetConnected(false);
-  m_gatt->ClearActiveAlgorithms();
+void BluetoothDevice::ClearAttributeInstanceMapAndFireEvent() {
   m_attributeInstanceMap->Clear();
   dispatchEvent(Event::createBubble(EventTypeNames::gattserverdisconnected));
 }
 
 const WTF::AtomicString& BluetoothDevice::interfaceName() const {
   return EventTargetNames::BluetoothDevice;
 }
 
 ExecutionContext* BluetoothDevice::getExecutionContext() const {
   return ContextLifecycleObserver::getExecutionContext();
 }
 
-void BluetoothDevice::DispatchGattServerDisconnected() {
-  if (!m_gatt->connected()) {
-    return;
-  }
-  CleanupDisconnectedDeviceAndFireEvent();
-}
-
 DEFINE_TRACE(BluetoothDevice) {
   visitor->trace(m_attributeInstanceMap);
   visitor->trace(m_gatt);
   visitor->trace(m_bluetooth);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink