bluetooth: Update BluetoothGATTCharacteristic.value on writeValue

content/renderer/bluetooth/bluetooth_dispatcher.cc

 // 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 "content/renderer/bluetooth/bluetooth_dispatcher.h"
 
 #include <stddef.h>
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 49 matching lines @@
       : service_instance_id(service_instance_id),
         characteristic_uuid(characteristic_uuid),
         callbacks(callbacks) {}
   ~BluetoothCharacteristicRequest() {}
 
   blink::WebString service_instance_id;
   blink::WebString characteristic_uuid;
   scoped_ptr<blink::WebBluetoothGetCharacteristicCallbacks> callbacks;
 };
 
+// Struct that holds a pending WriteValue request.
+struct BluetoothWriteValueRequest {
+  BluetoothWriteValueRequest(const blink::WebVector<uint8_t>& value,
+                             blink::WebBluetoothWriteValueCallbacks* callbacks)
+      : value(value), callbacks(callbacks) {}
+  ~BluetoothWriteValueRequest() {}
+
+  const blink::WebVector<uint8_t> value;
+  scoped_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks;
+};
+
 // Struct that holds a pending Start/StopNotifications request.
 struct BluetoothNotificationsRequest {
   BluetoothNotificationsRequest(
       int frame_routing_id,
       const std::string characteristic_instance_id,
       blink::WebBluetoothGATTCharacteristic* characteristic,
       blink::WebBluetoothNotificationsCallbacks* callbacks,
       NotificationsRequestType type)
       : frame_routing_id(frame_routing_id),
         characteristic_instance_id(characteristic_instance_id),
@@ skipping 186 matching lines @@
   Send(new BluetoothHostMsg_ReadValue(CurrentWorkerId(), request_id,
                                       frame_routing_id,
                                       characteristic_instance_id.utf8()));
 }
 
 void BluetoothDispatcher::writeValue(
     int frame_routing_id,
     const blink::WebString& characteristic_instance_id,
     const blink::WebVector<uint8_t>& value,
     blink::WebBluetoothWriteValueCallbacks* callbacks) {
-  int request_id = pending_write_value_requests_.Add(callbacks);
-
+  int request_id = pending_write_value_requests_.Add(
+      new BluetoothWriteValueRequest(value, callbacks));
   Send(new BluetoothHostMsg_WriteValue(
       CurrentWorkerId(), request_id, frame_routing_id,
       characteristic_instance_id.utf8(),
       std::vector<uint8_t>(value.begin(), value.end())));
 }
 
 void BluetoothDispatcher::startNotifications(
     int frame_routing_id,
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothGATTCharacteristic* characteristic,
@@ skipping 400 matching lines @@
 
   pending_read_value_requests_.Lookup(request_id)
       ->onError(WebBluetoothError(error));
 
   pending_read_value_requests_.Remove(request_id);
 }
 
 void BluetoothDispatcher::OnWriteValueSuccess(int thread_id, int request_id) {
   DCHECK(pending_write_value_requests_.Lookup(request_id)) << request_id;
 
-  pending_write_value_requests_.Lookup(request_id)->onSuccess();
+  BluetoothWriteValueRequest* request =
+      pending_write_value_requests_.Lookup(request_id);
+  request->callbacks->onSuccess(request->value);
 
   pending_write_value_requests_.Remove(request_id);
 }
 
 void BluetoothDispatcher::OnWriteValueError(int thread_id,
                                             int request_id,
                                             WebBluetoothError error) {
   DCHECK(pending_write_value_requests_.Lookup(request_id)) << request_id;
 
-  pending_write_value_requests_.Lookup(request_id)
-      ->onError(WebBluetoothError(error));
+  BluetoothWriteValueRequest* request =
+      pending_write_value_requests_.Lookup(request_id);
+  request->callbacks->onError(WebBluetoothError(error));
 
   pending_write_value_requests_.Remove(request_id);
 }
 
 void BluetoothDispatcher::OnStartNotificationsSuccess(int thread_id,
                                                       int request_id) {
   DCHECK(pending_notifications_requests_.Lookup(request_id)) << request_id;
 
   BluetoothNotificationsRequest* request =
       pending_notifications_requests_.Lookup(request_id);
@@ skipping 72 matching lines @@
     int thread_id,
     const std::string& characteristic_instance_id,
     const std::vector<uint8_t> new_value) {
   auto active_iter = active_characteristics_.find(characteristic_instance_id);
   if (active_iter != active_characteristics_.end()) {
     active_iter->second->dispatchCharacteristicValueChanged(new_value);
   }
 }
 
 }  // namespace content