| Index: third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
|
| diff --git a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
|
| index a2351c991d2a57338becadd1911e1c033aad3d17..2173f58e15fdc0d72954b5aba43789524a88930f 100644
|
| --- a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
|
| +++ b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
|
| @@ -13,7 +13,6 @@
|
| #include "wtf/Noncopyable.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefPtr.h"
|
| -
|
| #include <memory>
|
|
|
| namespace blink {
|
| @@ -27,7 +26,7 @@ class ScriptPromiseResolver;
|
| class PermissionsCallback final
|
| : public WebCallbacks<std::unique_ptr<WebVector<WebPermissionStatus>>, void> {
|
| public:
|
| - PermissionsCallback(ScriptPromiseResolver*, PassOwnPtr<Vector<WebPermissionType>>, PassOwnPtr<Vector<int>>);
|
| + PermissionsCallback(ScriptPromiseResolver*, std::unique_ptr<Vector<WebPermissionType>>, std::unique_ptr<Vector<int>>);
|
| ~PermissionsCallback() = default;
|
|
|
| void onSuccess(std::unique_ptr<WebVector<WebPermissionStatus>>) override;
|
| @@ -37,12 +36,12 @@ private:
|
| Persistent<ScriptPromiseResolver> m_resolver;
|
|
|
| // The permission types which were passed to the client to be requested.
|
| - OwnPtr<Vector<WebPermissionType>> m_internalPermissions;
|
| + std::unique_ptr<Vector<WebPermissionType>> m_internalPermissions;
|
|
|
| // Maps each index in the caller vector to the corresponding index in the
|
| // internal vector (i.e. the vector passsed to the client) such that both
|
| // indices have the same WebPermissionType.
|
| - OwnPtr<Vector<int>> m_callerIndexToInternalIndex;
|
| + std::unique_ptr<Vector<int>> m_callerIndexToInternalIndex;
|
|
|
| WTF_MAKE_NONCOPYABLE(PermissionsCallback);
|
| };
|
|
|