| Index: android_webview/browser/aw_contents_client_bridge_base.h
|
| diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h
|
| index 00598bae8b967809dfe79b2acc2dd354a64fd4d4..83fae9bfa7c420d5d2a2367f72890bb4fbf8778e 100644
|
| --- a/android_webview/browser/aw_contents_client_bridge_base.h
|
| +++ b/android_webview/browser/aw_contents_client_bridge_base.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
|
| #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_BASE_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/supports_user_data.h"
|
| #include "content/public/browser/javascript_dialog_manager.h"
|
|
|
| @@ -47,7 +48,7 @@ class AwContentsClientBridgeBase {
|
| bool* cancel_request) = 0;
|
| virtual void SelectClientCertificate(
|
| net::SSLCertRequestInfo* cert_request_info,
|
| - scoped_ptr<content::ClientCertificateDelegate> delegate) = 0;
|
| + std::unique_ptr<content::ClientCertificateDelegate> delegate) = 0;
|
|
|
| virtual void RunJavaScriptDialog(
|
| content::JavaScriptMessageType message_type,
|
|
|