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"
@@ skipping 65 matching lines @@
 }
 
 void BluetoothDevice::dispose() {
   disconnectGATTIfConnected();
 }
 
 void BluetoothDevice::contextDestroyed(ExecutionContext*) {
   disconnectGATTIfConnected();
 }
 
 void BluetoothDevice::disconnectGATTIfConnected() {

[ortuno, 2017/02/24 03:28:52]

Would it make sense to move disconnectGATTIfConnected,
cleanupDisconnectedDeviceAndFireEvent and dispatchGattServerDisconnected to the
server?

[juncai, 2017/03/01 02:04:12]

Done.

   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();
   m_attributeInstanceMap->Clear();
@@ skipping 17 matching lines @@
 
 DEFINE_TRACE(BluetoothDevice) {
   visitor->trace(m_attributeInstanceMap);
   visitor->trace(m_gatt);
   visitor->trace(m_bluetooth);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink