bluetooth: Move GetCharacteristic(s) over to Mojo

content/browser/bluetooth/bluetooth_dispatcher_host.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 CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
-#include "content/browser/bluetooth/bluetooth_metrics.h"
-#include "content/common/bluetooth/bluetooth_messages.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
 #include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
 
 namespace device {
 class BluetoothUUID;
 }
 
 namespace content {
 
 struct BluetoothScanFilter;
+struct CacheQueryResult;
 
 // Dispatches and sends bluetooth related messages sent to/from a child
 // process BluetoothDispatcher from/to the main browser process.
 //
 // Intended to be instantiated by the RenderProcessHost and installed as
 // a filter on the channel. BrowserMessageFilter is refcounted and typically
 // lives as long as it is installed on a channel.
 //
 // UI Thread Note:
 // BluetoothDispatcherHost is constructed, operates, and destroyed on the UI
 // thread because BluetoothAdapter and related objects live there.
 class CONTENT_EXPORT BluetoothDispatcherHost final
     : public BrowserMessageFilter,
       public device::BluetoothAdapter::Observer {
  public:
   BluetoothDispatcherHost(int render_process_id);
   // BrowserMessageFilter:
   void OnDestruct() const override;
   void OverrideThreadForMessage(const IPC::Message& message,
                                 BrowserThread::ID* thread) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   void SetBluetoothAdapterForTesting(
       scoped_refptr<device::BluetoothAdapter> mock_adapter);
 
-  // TODO(ortuno): We temporarily make this a public struct so that
-  // both BluetoothDispatcherHost and WebBluetoothServiceImpl can use it,
-  // while we move functions from BluetoothDispatcherHost to
-  // WebBluetoothServiceImpl.
-  // https://crbug.com/508771
-  struct CacheQueryResult {
-    CacheQueryResult();
-    CacheQueryResult(CacheQueryOutcome outcome);
-    ~CacheQueryResult();
-    blink::WebBluetoothError GetWebError() const;
-    device::BluetoothDevice* device = nullptr;
-    device::BluetoothGattService* service = nullptr;
-    device::BluetoothGattCharacteristic* characteristic = nullptr;
-    CacheQueryOutcome outcome = CacheQueryOutcome::SUCCESS;
-  };
-
-  // Queries the platform cache for a characteristic with
-  // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
-  // |service| and |characteristic| fields if successful.
-  CacheQueryResult QueryCacheForCharacteristic(
-      const url::Origin& origin,
-      const std::string& characteristic_instance_id);
+  // Queries the platform cache for a Service with |service_instance_id|. Fills
+  // in the |outcome| field, and |device| and |service| fields if successful.
+  CacheQueryResult QueryCacheForService(const url::Origin& origin,

[Jeffrey Yasskin, 2016/04/22 01:16:37]

It might make sense to make BluetoothServiceImpl a friend so you don't need to
gradually rearrange things into the public section during this refactoring.

[ortuno, 2016/04/25 15:29:45]

Done.

+                                        const std::string& service_instance_id);
 
   // Temporary functions so that WebBluetoothServices can add themselves as
   // observers of the Bluetooth Adapter without having to get an adapter for
   // themselves.
   // TODO(ortuno): Remove once WebBluetoothServiceImpl gets its own adapter.
   // https://crbug.com/508771
   void AddAdapterObserver(device::BluetoothAdapter::Observer* observer);
   void RemoveAdapterObserver(device::BluetoothAdapter::Observer* observer);
 
  protected:
@@ skipping 70 matching lines @@
                            int frame_routing_id,
                            const std::string& device_id);
   void OnGATTServerDisconnect(int thread_id,
                               int frame_routing_id,
                               const std::string& device_id);
   void OnGetPrimaryService(int thread_id,
                            int request_id,
                            int frame_routing_id,
                            const std::string& device_id,
                            const std::string& service_uuid);
-  void OnGetCharacteristic(int thread_id,
-                           int request_id,
-                           int frame_routing_id,
-                           const std::string& service_instance_id,
-                           const std::string& characteristic_uuid);
-  void OnGetCharacteristics(int thread_id,
-                            int request_id,
-                            int frame_routing_id,
-                            const std::string& service_instance_id,
-                            const std::string& characteristics_uuid);
 
   // Callbacks for BluetoothDevice::OnRequestDevice.
   // If necessary, the adapter must be obtained before continuing to Impl.
   void OnGetAdapter(base::Closure continuation,
                     scoped_refptr<device::BluetoothAdapter> adapter);
   void OnRequestDeviceImpl(
       int thread_id,
       int request_id,
       int frame_routing_id,
       const std::vector<content::BluetoothScanFilter>& filters,
@@ skipping 44 matching lines @@
   // cache. Otherwise result.outcome that can used to record the outcome and
   // result.error will contain the error that should be send to the renderer.
   // One of the possible outcomes is BAD_RENDERER. In this case the outcome
   // was already recorded and since there renderer crashed there is no need to
   // send a response.
 
   // Queries the platform cache for a Device with |device_id| for |origin|.
   // Fills in the |outcome| field and the |device| field if successful.
   CacheQueryResult QueryCacheForDevice(const url::Origin& origin,
                                        const std::string& device_id);
-  // Queries the platform cache for a Service with |service_instance_id|. Fills
-  // in the |outcome| field, and |device| and |service| fields if successful.
-  CacheQueryResult QueryCacheForService(const url::Origin& origin,
-                                        const std::string& service_instance_id);
 
   // Adds the PrimaryServicesRequest to the vector of pending services requests
   // for that device.
   void AddToPendingPrimaryServicesRequest(
       const std::string& device_address,
       const PrimaryServicesRequest& request);
 
   // Returns the origin for the frame with "frame_routing_id" in
   // render_process_id_.
   url::Origin GetOrigin(int frame_routing_id);
 
   int render_process_id_;
 
   // Maps a (thread_id,request_id) to information about its requestDevice call,
   // including the chooser dialog.
   // An entry is added to this map in OnRequestDevice, and should be removed
   // again everywhere a requestDevice() reply is sent.
   IDMap<RequestDeviceSession, IDMapOwnPointer> request_device_sessions_;
 
   BluetoothAllowedDevicesMap allowed_devices_map_;
 
   // Maps to get the object's parent based on it's instanceID
   // Map of service_instance_id to device_address.
   std::map<std::string, std::string> service_to_device_;
-  // Map of characteristic_instance_id to service_instance_id.
-  std::map<std::string, std::string> characteristic_to_service_;
 
   // Defines how long to scan for and how long to discover services for.
   int current_delay_time_;
 
   // A BluetoothAdapter instance representing an adapter of the system.
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   std::unordered_set<device::BluetoothAdapter::Observer*> adapter_observers_;
 
   // Automatically stops Bluetooth discovery a set amount of time after it was
@@ skipping 16 matching lines @@
   // copies verify they are also used on the UI thread.
   base::WeakPtr<BluetoothDispatcherHost> weak_ptr_on_ui_thread_;
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_