Convert //android_webview to use std::unique_ptr

android_webview/native/android_protocol_handler.cc

 // Copyright (c) 2012 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.
 
 #include "android_webview/native/android_protocol_handler.h"
 
 #include <utility>
 
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/native/input_stream_impl.h"
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/memory/ptr_util.h"
 #include "content/public/common/url_constants.h"
 #include "jni/AndroidProtocolHandler_jni.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
@@ skipping 29 matching lines @@
 
 bool HasRequestPreviouslyFailed(net::URLRequest* request) {
   return request->GetUserData(kPreviouslyFailedKey) != NULL;
 }
 
 class AndroidStreamReaderURLRequestJobDelegateImpl
     : public AndroidStreamReaderURLRequestJob::Delegate {
  public:
   AndroidStreamReaderURLRequestJobDelegateImpl();
 
-  scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                          const GURL& url) override;
+  std::unique_ptr<InputStream> OpenInputStream(JNIEnv* env,
+                                               const GURL& url) override;
 
   void OnInputStreamOpenFailed(net::URLRequest* request,
                                bool* restart) override;
 
   bool GetMimeType(JNIEnv* env,
                    net::URLRequest* request,
                    InputStream* stream,
                    std::string* mime_type) override;
 
   bool GetCharset(JNIEnv* env,
@@ skipping 42 matching lines @@
 
 // AndroidStreamReaderURLRequestJobDelegateImpl -------------------------------
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
     AndroidStreamReaderURLRequestJobDelegateImpl() {}
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
 ~AndroidStreamReaderURLRequestJobDelegateImpl() {
 }
 
-scoped_ptr<InputStream>
-AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(
-    JNIEnv* env, const GURL& url) {
+std::unique_ptr<InputStream>
+AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(JNIEnv* env,
+                                                              const GURL& url) {
   DCHECK(url.is_valid());
   DCHECK(env);
 
   // Open the input stream.
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jobject> stream =
       android_webview::Java_AndroidProtocolHandler_open(
           env,
           GetResourceContext(env).obj(),
           jurl.obj());
 
   if (stream.is_null()) {
     DLOG(ERROR) << "Unable to open input stream for Android URL";
-    return scoped_ptr<InputStream>();
+    return std::unique_ptr<InputStream>();
   }
-  return make_scoped_ptr<InputStream>(new InputStreamImpl(stream));
+  return base::WrapUnique(new InputStreamImpl(stream));
 }
 
 void AndroidStreamReaderURLRequestJobDelegateImpl::OnInputStreamOpenFailed(
     net::URLRequest* request,
     bool* restart) {
   DCHECK(!HasRequestPreviouslyFailed(request));
   MarkRequestAsFailed(request);
   *restart = true;
 }
 
@@ skipping 53 matching lines @@
   // If a request is initially handled here but the job fails due to it being
   // unable to open the InputStream for that request the request is marked as
   // previously failed and restarted.
   // Restarting a request involves creating a new job for that request. This
   // handler will ignore requests know to have previously failed to 1) prevent
   // an infinite loop, 2) ensure that the next handler in line gets the
   // opportunity to create a job for the request.
   if (HasRequestPreviouslyFailed(request))
     return NULL;
 
-  scoped_ptr<AndroidStreamReaderURLRequestJobDelegateImpl> reader_delegate(
+  std::unique_ptr<AndroidStreamReaderURLRequestJobDelegateImpl> reader_delegate(
       new AndroidStreamReaderURLRequestJobDelegateImpl());
 
   return new AndroidStreamReaderURLRequestJob(request, network_delegate,
                                               std::move(reader_delegate));
 }
 
 // AssetFileRequestInterceptor ------------------------------------------------
 
 AssetFileRequestInterceptor::AssetFileRequestInterceptor() {
 }
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 namespace android_webview {
 
 bool RegisterAndroidProtocolHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-scoped_ptr<net::URLRequestInterceptor>
+std::unique_ptr<net::URLRequestInterceptor>
 CreateContentSchemeRequestInterceptor() {
-  return make_scoped_ptr<net::URLRequestInterceptor>(
-      new ContentSchemeRequestInterceptor());
+  return base::WrapUnique(new ContentSchemeRequestInterceptor());
 }
 
 // static
-scoped_ptr<net::URLRequestInterceptor> CreateAssetFileRequestInterceptor() {
-  return scoped_ptr<net::URLRequestInterceptor>(
+std::unique_ptr<net::URLRequestInterceptor>
+CreateAssetFileRequestInterceptor() {
+  return std::unique_ptr<net::URLRequestInterceptor>(
       new AssetFileRequestInterceptor());
 }
 
 // Set a context object to be used for resolving resource queries. This can
 // be used to override the default application context and redirect all
 // resource queries to a specific context object, e.g., for the purposes of
 // testing.
 //
 // |context| should be a android.content.Context instance or NULL to enable
 // the use of the standard application context.
@@ skipping 13 matching lines @@
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidAssetPath);
 }
 
 static ScopedJavaLocalRef<jstring> GetAndroidResourcePath(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*clazz*/) {
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidResourcePath);
 }
 
 }  // namespace android_webview