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 57 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() {

[ortuno, 2017/03/01 04:52:06]

Let's just do both on BluetoothRemoteGATTServer.

[juncai, 2017/03/02 03:23:47]

Done.

[ortuno, 2017/03/06 11:31:20]

Also add contextDestroyed to BluetoothRemoteGATTServer. After that we can remove
both of these from BluetoothDevice.

[juncai, 2017/03/09 07:30:57]

Done.

-  disconnectGATTIfConnected();
+  m_gatt->disconnectIfConnected();
 }
 
 void BluetoothDevice::contextDestroyed(ExecutionContext*) {
-  disconnectGATTIfConnected();
+  m_gatt->disconnectIfConnected();
 }
 
-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