CallbackPromiseAdapter types should be more compatible with WebCallbacks (1/3).

public/platform/modules/bluetooth/WebBluetooth.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 WebBluetooth_h
 #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 <vector>
 
 namespace blink {
 
 struct WebBluetoothDevice;
 struct WebBluetoothGATTCharacteristic;
 struct WebBluetoothGATTRemoteServer;
 struct WebBluetoothGATTService;
 struct WebRequestDeviceOptions;
 
 // Success and failure callbacks for requestDevice.
 // WebBluetoothDevice and WebBluetoothError object ownership is transferred.

[scheib, 2015/07/27 17:35:28]

Comments of form "// ... and ... object ownership is transferred" are redundant
with code now -- the code explains this clearly enough so please remove
comments.

[yhirano, 2015/07/29 04:01:54]

Done.

-typedef WebCallbacks<WebBluetoothDevice*, WebBluetoothError*> WebBluetoothRequestDeviceCallbacks;
+using WebBluetoothRequestDeviceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothDevice>, WebPassOwnPtr<WebBluetoothError>>;
 
 // Success and failure callbacks for connectGATT.
 // WebBluetoothGATTRemoteServer and WebBluetoothError object ownership is transferred.
-typedef WebCallbacks<WebBluetoothGATTRemoteServer*, WebBluetoothError*> WebBluetoothConnectGATTCallbacks;
+using WebBluetoothConnectGATTCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTRemoteServer>, WebPassOwnPtr<WebBluetoothError>>;
 
 // Success and failure callbacks for getPrimaryService.
 // WebBluetoothGATTService and WebBluetoothError object ownership is transferred.
-typedef WebCallbacks<WebBluetoothGATTService*, WebBluetoothError*> WebBluetoothGetPrimaryServiceCallbacks;
+using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTService>, WebPassOwnPtr<WebBluetoothError>>;
 
 // Success and failure callbacks for getCharacteristic.
 // WebBluetoothCharacteristic and WebBluetoothError object ownership is transferred.
-typedef WebCallbacks<WebBluetoothGATTCharacteristic*, WebBluetoothError*> WebBluetoothGetCharacteristicCallbacks;
+using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTCharacteristic>, WebPassOwnPtr<WebBluetoothError>>;
 
 // Success and failure callbacks for readValue.
 // WebVector and WebBluetoothError object ownership is transferred.
-typedef WebCallbacks<WebVector<uint8_t>*, WebBluetoothError*> WebBluetoothReadValueCallbacks;
+using WebBluetoothReadValueCallbacks = WebCallbacks<WebPassOwnPtr<WebVector<uint8_t>>, WebPassOwnPtr<WebBluetoothError>>;
 
 // Success and failure callbacks for writeValue.
 // WebBluetoothError object ownership is transferred.
-typedef WebCallbacks<void, WebBluetoothError*> WebBluetoothWriteValueCallbacks;
+using WebBluetoothWriteValueCallbacks = WebCallbacks<void, WebPassOwnPtr<WebBluetoothError>>;
 
 class WebBluetooth {
 public:
     virtual ~WebBluetooth() { }
 
     // Bluetooth Methods:
     // See https://webbluetoothchrome.github.io/web-bluetooth/#device-discovery
     // WebBluetoothRequestDeviceCallbacks ownership transferred to the client.
     virtual void requestDevice(const WebRequestDeviceOptions&, WebBluetoothRequestDeviceCallbacks*) { }
 
@@ skipping 22 matching lines @@
     virtual void readValue(const WebString& characteristicInstanceID,
         WebBluetoothReadValueCallbacks*) { }
     virtual void writeValue(const WebString& characteristicInstanceID,
         const std::vector<uint8_t>& value,
         WebBluetoothWriteValueCallbacks*) { }
 };
 
 } // namespace blink
 
 #endif // WebBluetooth_h