Use new wrapper types for web_bluetooth.mojom

content/renderer/bluetooth/web_bluetooth_impl.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_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 #define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 68 matching lines @@
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
   void registerCharacteristicObject(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
 
  private:
   struct GetCharacteristicsCallback;
   // WebBluetoothServiceClient methods:
   void RemoteCharacteristicValueChanged(
-      const mojo::String& characteristic_instance_id,
-      mojo::Array<uint8_t> value) override;
+      const std::string& characteristic_instance_id,
+      const std::vector<uint8_t>& value) override;
   void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
 
   // Callbacks for WebBluetoothService calls:
   void OnRequestDeviceComplete(
       std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
       const blink::mojom::WebBluetoothResult result,
       blink::mojom::WebBluetoothDevicePtr device);
   void OnConnectComplete(
       std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
           callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnGetPrimaryServicesComplete(
       const blink::WebString& device_id,
       std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
-      mojo::Array<blink::mojom::WebBluetoothRemoteGATTServicePtr> services);
+      base::Optional<
+          std::vector<blink::mojom::WebBluetoothRemoteGATTServicePtr>>
+          services);
   void OnGetCharacteristicsComplete(
       const blink::WebString& service_instance_id,
       std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
-      mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
+      base::Optional<
+          std::vector<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>>
           characteristics);
   void OnReadValueComplete(
       std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
-      mojo::Array<uint8_t> value);
+      const base::Optional<std::vector<uint8_t>>& value);
   void OnWriteValueComplete(
       const blink::WebVector<uint8_t>& value,
       std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStartNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStopNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks);
 
@@ skipping 22 matching lines @@
 
   // Binding associated with |web_bluetooth_service_|.
   mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_