| Index: android_webview/native/android_protocol_handler.h
|
| diff --git a/android_webview/native/android_protocol_handler.h b/android_webview/native/android_protocol_handler.h
|
| index d5a4df1a6c080bfa4b5e00a03b61707d186f8d24..6f538516268110965075f99ee7f186ac7d66b326 100644
|
| --- a/android_webview/native/android_protocol_handler.h
|
| +++ b/android_webview/native/android_protocol_handler.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef ANDROID_WEBVIEW_NATIVE_ANDROID_PROTOCOL_HANDLER_H_
|
| #define ANDROID_WEBVIEW_NATIVE_ANDROID_PROTOCOL_HANDLER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/android/jni_android.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace net {
|
| class URLRequestContext;
|
| @@ -20,13 +21,14 @@ namespace android_webview {
|
| // - "content:" scheme is used for accessing data from Android content
|
| // providers, see http://developer.android.com/guide/topics/providers/
|
| // content-provider-basics.html#ContentURIs
|
| -scoped_ptr<net::URLRequestInterceptor> CreateContentSchemeRequestInterceptor();
|
| +std::unique_ptr<net::URLRequestInterceptor>
|
| +CreateContentSchemeRequestInterceptor();
|
|
|
| // - "file:" scheme extension for accessing application assets and resources
|
| // (file:///android_asset/ and file:///android_res/), see
|
| // http://developer.android.com/reference/android/webkit/
|
| // WebSettings.html#setAllowFileAccess(boolean)
|
| -scoped_ptr<net::URLRequestInterceptor> CreateAssetFileRequestInterceptor();
|
| +std::unique_ptr<net::URLRequestInterceptor> CreateAssetFileRequestInterceptor();
|
|
|
| bool RegisterAndroidProtocolHandler(JNIEnv* env);
|
|
|
|
|