| Index: android_webview/native/permission/aw_permission_request.h
|
| diff --git a/android_webview/native/permission/aw_permission_request.h b/android_webview/native/permission/aw_permission_request.h
|
| index c8350c4749640dcf2adc98f50262ed4e98b942d7..ac516eabe44f1302de082af93d9bb6ec1946bddb 100644
|
| --- a/android_webview/native/permission/aw_permission_request.h
|
| +++ b/android_webview/native/permission/aw_permission_request.h
|
| @@ -36,7 +36,7 @@ class AwPermissionRequest {
|
| // Take the ownership of |delegate|. Returns the native pointer in
|
| // |weak_ptr|, which is owned by the returned java peer.
|
| static base::android::ScopedJavaLocalRef<jobject> Create(
|
| - scoped_ptr<AwPermissionRequestDelegate> delegate,
|
| + std::unique_ptr<AwPermissionRequestDelegate> delegate,
|
| base::WeakPtr<AwPermissionRequest>* weak_ptr);
|
|
|
| // Return the Java peer. Must be null-checked.
|
| @@ -64,14 +64,14 @@ class AwPermissionRequest {
|
| private:
|
| friend class TestPermissionRequestHandlerClient;
|
|
|
| - AwPermissionRequest(scoped_ptr<AwPermissionRequestDelegate> delegate,
|
| + AwPermissionRequest(std::unique_ptr<AwPermissionRequestDelegate> delegate,
|
| base::android::ScopedJavaLocalRef<jobject>* java_peer);
|
| ~AwPermissionRequest();
|
|
|
| void OnAcceptInternal(bool accept);
|
| void DeleteThis();
|
|
|
| - scoped_ptr<AwPermissionRequestDelegate> delegate_;
|
| + std::unique_ptr<AwPermissionRequestDelegate> delegate_;
|
| JavaObjectWeakGlobalRef java_ref_;
|
|
|
| bool processed_;
|
|
|