bluetooth: Move writeValue 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"

[Jeffrey Yasskin, 2016/03/25 00:48:23]

I don't think you're using this #include?

[ortuno, 2016/03/29 17:58:34]

We need both:
 - bluetooth_messages for blink::WebBluetoothError in GetWebError for
CacheQueryResult.
 - bluetooth_metrics for CacheQueryOutcome in CacheQueryResult.

[Jeffrey Yasskin, 2016/03/29 20:30:02]

Now that everything's using the mojo enum, try including just
third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h
instead of the whole messages file. DEPS needs to allow that regardless, in
order for WebBluetoothServiceImpl to work.

[ortuno, 2016/03/29 22:14:03]

I do that in content/renderer/web_bluetooth_impl and
content/browser/web_bluetooth_service_impl. I haven't done the same for old
files e.g. bluetooth_dispatcher_host because they shouldn't know anything about
mojo.

 #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;
 }
@@ skipping 19 matching lines @@
   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);
 
+  struct CacheQueryResult {

[Jeffrey Yasskin, 2016/03/25 00:48:23]

Are these only temporarily here? If so, put a TODO saying that.

[ortuno, 2016/03/29 17:58:34]

Done.

+    CacheQueryResult();
+    CacheQueryResult(CacheQueryOutcome outcome);
+    ~CacheQueryResult();
+    blink::WebBluetoothError GetWebError() const;
+    device::BluetoothDevice* device = nullptr;
+    device::BluetoothGattService* service = nullptr;
+    device::BluetoothGattCharacteristic* characteristic = nullptr;
+    CacheQueryOutcome outcome;
+  };
+
+  // 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);
+
  protected:
   ~BluetoothDispatcherHost() override;
 
  private:
   friend class base::DeleteHelper<BluetoothDispatcherHost>;
   friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
 
-  struct CacheQueryResult;
   struct RequestDeviceSession;
   struct PrimaryServicesRequest;
 
   // Set |adapter_| to a BluetoothAdapter instance and register observers,
   // releasing references to previous |adapter_|.
   void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Makes sure a BluetoothDiscoverySession is active for |session|, and resets
   // its timeout.
   void StartDeviceDiscovery(RequestDeviceSession* session, int chooser_id);
@@ skipping 48 matching lines @@
                            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);
   void OnReadValue(int thread_id,
                    int request_id,
                    int frame_routing_id,
                    const std::string& characteristic_instance_id);
-  void OnWriteValue(int thread_id,
-                    int request_id,
-                    int frame_routing_id,
-                    const std::string& characteristic_instance_id,
-                    const std::vector<uint8_t>& value);
   void OnStartNotifications(int thread_id,
                             int request_id,
                             int frame_routing_id,
                             const std::string& characteristic_instance_id);
   void OnStopNotifications(int thread_id,
                            int request_id,
                            int frame_routing_id,
                            const std::string& characteristic_instance_id);
   void OnRegisterCharacteristicObject(
       int thread_id,
@@ skipping 56 matching lines @@
 
   // Callbacks for BluetoothGattCharacteristic::ReadRemoteCharacteristic.
   void OnCharacteristicValueRead(int thread_id,
                                  int request_id,
                                  const std::vector<uint8_t>& value);
   void OnCharacteristicReadValueError(
       int thread_id,
       int request_id,
       device::BluetoothGattService::GattErrorCode);
 
-  // Callbacks for BluetoothGattCharacteristic::WriteRemoteCharacteristic.
-  void OnWriteValueSuccess(int thread_id, int request_id);
-  void OnWriteValueFailed(int thread_id,
-                          int request_id,
-                          device::BluetoothGattService::GattErrorCode);
-
   // Callbacks for BluetoothGattCharacteristic::StartNotifySession.
   void OnStartNotifySessionSuccess(
       int thread_id,
       int request_id,
       scoped_ptr<device::BluetoothGattNotifySession> notify_session);
   void OnStartNotifySessionFailed(
       int thread_id,
       int request_id,
       device::BluetoothGattService::GattErrorCode error_code);
 
@@ skipping 11 matching lines @@
   // 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);
-  // 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);
 
   // 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);
@@ skipping 58 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_