Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

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

 // 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.
 
 #ifndef BluetoothDevice_h
 #define BluetoothDevice_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "modules/EventTargetModules.h"
@@ skipping 61 matching lines @@
   // events on navigator.bluetooth and still remain connected even if the
   // BluetoothDevice object is garbage collected.
 
   // USING_PRE_FINALIZER interface.
   // Called before the object gets garbage collected.
   void dispose();
 
   // ContextLifecycleObserver interface.
   void contextDestroyed(ExecutionContext*) override;
 
-  // If gatt is connected then sets gatt.connected to false and disconnects.
-  // This function only performs the necessary steps to ensure a device
-  // disconnects therefore it should only be used when the object is being
-  // garbage collected or the context is being destroyed.
-  void disconnectGATTIfConnected();
-
   // Performs necessary cleanup when a device disconnects and fires
   // gattserverdisconnected event.
-  void cleanupDisconnectedDeviceAndFireEvent();
+  void clearAttributeInstanceMapAndFireEvent();
 
   // EventTarget methods:
   const AtomicString& interfaceName() const override;
   ExecutionContext* getExecutionContext() const override;
 
-  void dispatchGattServerDisconnected();
-
   Bluetooth* bluetooth() { return m_bluetooth; }
 
   // Interface required by Garbage Collection:
   DECLARE_VIRTUAL_TRACE();
 
   // IDL exposed interface:
   String id() { return m_device->id; }
   String name() { return m_device->name; }
   BluetoothRemoteGATTServer* gatt() { return m_gatt; }
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(gattserverdisconnected);
 
  private:
   // Holds all GATT Attributes associated with this BluetoothDevice.
   Member<BluetoothAttributeInstanceMap> m_attributeInstanceMap;
 
   mojom::blink::WebBluetoothDevicePtr m_device;
   Member<BluetoothRemoteGATTServer> m_gatt;
   Member<Bluetooth> m_bluetooth;
 };
 
 }  // namespace blink
 
 #endif  // BluetoothDevice_h