| Index: third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h
|
| diff --git a/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h b/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h
|
| index b6352ab5f8ad4d1e5fc570d6dd340b89d618fc23..c022ff1dc54240f55234fa1d3538cde8b1f62e50 100644
|
| --- a/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h
|
| +++ b/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h
|
| @@ -6,11 +6,12 @@
|
| #define WebBluetooth_h
|
|
|
| #include "public/platform/WebCallbacks.h"
|
| -#include "public/platform/WebPassOwnPtr.h"
|
| #include "public/platform/WebString.h"
|
| #include "public/platform/WebVector.h"
|
| #include "public/platform/modules/bluetooth/WebBluetoothError.h"
|
|
|
| +#include <memory>
|
| +
|
| namespace blink {
|
|
|
| class WebBluetoothRemoteGATTCharacteristic;
|
| @@ -21,20 +22,19 @@ struct WebBluetoothRemoteGATTService;
|
| struct WebRequestDeviceOptions;
|
|
|
| // Success and failure callbacks for requestDevice.
|
| -using WebBluetoothRequestDeviceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothDevice>, const WebBluetoothError&>;
|
| +using WebBluetoothRequestDeviceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothDevice>, const WebBluetoothError&>;
|
|
|
| // Success and failure callbacks for connectGATT.
|
| using WebBluetoothRemoteGATTServerConnectCallbacks = WebCallbacks<void, const WebBluetoothError&>;
|
|
|
| // Success and failure callbacks for getPrimaryService.
|
| -using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothRemoteGATTService>, const WebBluetoothError&>;
|
| +using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothRemoteGATTService>, const WebBluetoothError&>;
|
|
|
| // Success and failure callbacks for getCharacteristic.
|
| -using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothRemoteGATTCharacteristicInit>, const WebBluetoothError&>;
|
| +using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit>, const WebBluetoothError&>;
|
|
|
| // Success and failure callbacks for getCharacteristics.
|
| -using WebBluetoothGetCharacteristicsCallbacks =
|
| - WebCallbacks<WebPassOwnPtr<WebVector<WebBluetoothRemoteGATTCharacteristicInit*>>, const WebBluetoothError&>;
|
| +using WebBluetoothGetCharacteristicsCallbacks = WebCallbacks<std::unique_ptr<WebVector<WebBluetoothRemoteGATTCharacteristicInit*>>, const WebBluetoothError&>;
|
|
|
| // Success and failure callbacks for readValue.
|
| using WebBluetoothReadValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const WebBluetoothError&>;
|
|
|