Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

content/browser/bluetooth/web_bluetooth_service_impl.h

 // Copyright 2016 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 CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/bluetooth/bluetooth_allowed_devices.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
@@ skipping 70 matching lines @@
       const std::vector<uint8_t>& value) override;
 
   // Notifies the WebBluetoothServiceClient that characteristic
   // |characteristic_instance_id| changed it's value. We only do this for
   // characteristics that have been returned to the client in the past.
   void NotifyCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       const std::vector<uint8_t>& value);
 
   // WebBluetoothService methods:
-  void SetClient(
-      blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo client) override;
   void RequestDevice(blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
                      const RequestDeviceCallback& callback) override;
   void RemoteServerConnect(
       const WebBluetoothDeviceId& device_id,
       const RemoteServerConnectCallback& callback) override;
   void RemoteServerDisconnect(const WebBluetoothDeviceId& device_id) override;
   void RemoteServerGetPrimaryServices(
       const WebBluetoothDeviceId& device_id,
       blink::mojom::WebBluetoothGATTQueryQuantity quantity,
       const base::Optional<device::BluetoothUUID>& services_uuid,
@@ skipping 152 matching lines @@
 
   // Map to keep track of the connected Bluetooth devices.
   std::unique_ptr<FrameConnectedBluetoothDevices> connected_devices_;
 
   // Maps a device address to callbacks that are waiting for services to
   // be discovered for that device.
   std::unordered_map<std::string, std::vector<PrimaryServicesRequestCallback>>
       pending_primary_services_requests_;
 
   // Map to keep track of the characteristics' notify sessions.
-  std::unordered_map<std::string,
-                     std::unique_ptr<device::BluetoothGattNotifySession>>
+  std::unordered_map<
+      std::string,
+      std::pair<std::unique_ptr<device::BluetoothGattNotifySession>,
+                blink::mojom::WebBluetoothCharacteristicClientAssociatedPtr>>
       characteristic_id_to_notify_session_;
 
   // The RFH that owns this instance.
   RenderFrameHost* render_frame_host_;
 
-  // Proxy to the WebBluetoothServiceClient to send device events to.
-  blink::mojom::WebBluetoothServiceClientAssociatedPtr client_;
-
   // The lifetime of this instance is exclusively managed by the RFH that
   // owns it so we use a "Binding" as opposed to a "StrongBinding" which deletes
   // the service on pipe connection errors.
   mojo::Binding<blink::mojom::WebBluetoothService> binding_;
 
   base::WeakPtrFactory<WebBluetoothServiceImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_