Convert //android_webview to use std::unique_ptr

android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Index: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index ea272b99638092f8d30f2ba9df87a6d8dae6a024..68b759f58f357b55b6601a857bdf30b645deedbc 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -4,13 +4,14 @@
 
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 
+#include <memory>
 #include <utility>
 
 #include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/input_stream_reader.h"
 #include "base/format_macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
@@ -77,9 +78,9 @@ class StreamReaderDelegate :
  public:
   StreamReaderDelegate() {}
 
-  scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                          const GURL& url) override {
-    return make_scoped_ptr<InputStream>(new NotImplInputStream());
+  std::unique_ptr<InputStream> OpenInputStream(JNIEnv* env,
+                                               const GURL& url) override {
+    return base::WrapUnique(new NotImplInputStream());
   }
 
   void OnInputStreamOpenFailed(net::URLRequest* request,
@@ -111,9 +112,9 @@ class NullStreamReaderDelegate : public StreamReaderDelegate {
  public:
   NullStreamReaderDelegate() {}
 
-  scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                          const GURL& url) override {
-    return make_scoped_ptr<InputStream>(NULL);
+  std::unique_ptr<InputStream> OpenInputStream(JNIEnv* env,
+                                               const GURL& url) override {
+    return nullptr;
   }
 };
 
@@ -158,8 +159,8 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
  public:
   TestStreamReaderJob(net::URLRequest* request,
                       net::NetworkDelegate* network_delegate,
-                      scoped_ptr<Delegate> delegate,
-                      scoped_ptr<InputStreamReader> stream_reader)
+                      std::unique_ptr<Delegate> delegate,
+                      std::unique_ptr<InputStreamReader> stream_reader)
       : AndroidStreamReaderURLRequestJob(request,
                                          network_delegate,
                                          std::move(delegate)),
@@ -169,7 +170,7 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
 
   ~TestStreamReaderJob() override {}
 
-  scoped_ptr<InputStreamReader> CreateStreamReader(
+  std::unique_ptr<InputStreamReader> CreateStreamReader(
       InputStream* stream) override {
     return std::move(stream_reader_);
   }
@@ -179,7 +180,7 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
     return task_runner_.get();
   }
 
-  scoped_ptr<InputStreamReader> stream_reader_;
+  std::unique_ptr<InputStreamReader> stream_reader_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
 
@@ -208,20 +209,21 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
     req->SetExtraRequestHeaders(headers);
   }
 
-  void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) {
+  void SetUpTestJob(std::unique_ptr<InputStreamReader> stream_reader) {
     SetUpTestJob(std::move(stream_reader),
-                 make_scoped_ptr(new StreamReaderDelegate()));
+                 base::WrapUnique(new StreamReaderDelegate()));
   }
 
-  void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader,
-                    scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>
+  void SetUpTestJob(std::unique_ptr<InputStreamReader> stream_reader,
+                    std::unique_ptr<AndroidStreamReaderURLRequestJob::Delegate>
                         stream_reader_delegate) {
-    scoped_ptr<TestStreamReaderJob> test_stream_reader_job(
+    std::unique_ptr<TestStreamReaderJob> test_stream_reader_job(
         new TestStreamReaderJob(req_.get(), &network_delegate_,
                                 std::move(stream_reader_delegate),
                                 std::move(stream_reader)));
     // The Interceptor is owned by the |factory_|.
-    scoped_ptr<TestJobInterceptor> protocol_handler(new TestJobInterceptor);
+    std::unique_ptr<TestJobInterceptor> protocol_handler(
+        new TestJobInterceptor);
     protocol_handler->set_main_intercept_job(std::move(test_stream_reader_job));
     bool set_protocol =
         factory_.SetProtocolHandler("content", std::move(protocol_handler));
@@ -233,11 +235,11 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
   android_webview::AwURLRequestJobFactory factory_;
   TestDelegate url_request_delegate_;
   TestNetworkDelegate network_delegate_;
-  scoped_ptr<URLRequest> req_;
+  std::unique_ptr<URLRequest> req_;
 };
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
+  std::unique_ptr<StrictMock<MockInputStreamReader>> stream_reader(
       new StrictMock<MockInputStreamReader>());
   {
     InSequence s;
@@ -261,7 +263,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
-  SetUpTestJob(nullptr, make_scoped_ptr(new NullStreamReaderDelegate()));
+  SetUpTestJob(nullptr, base::WrapUnique(new NullStreamReaderDelegate()));
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
@@ -278,7 +280,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) {
   SetUpTestJob(nullptr,
-               make_scoped_ptr(new HeaderAlteringStreamReaderDelegate()));
+               base::WrapUnique(new HeaderAlteringStreamReaderDelegate()));
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
@@ -308,7 +310,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
   const int bytes_available = 128;
   const int offset = 32;
   const int bytes_to_read = bytes_available - offset;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
+  std::unique_ptr<StrictMock<MockInputStreamReader>> stream_reader(
       new StrictMock<MockInputStreamReader>());
   {
     InSequence s;
@@ -341,7 +343,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest,
   const int bytes_available = 128;
   const int offset = 0;
   const int bytes_to_read = bytes_available - offset;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
+  std::unique_ptr<StrictMock<MockInputStreamReader>> stream_reader(
       new StrictMock<MockInputStreamReader>());
   {
     InSequence s;
@@ -370,7 +372,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
   const int offset = 20;
   const int bytes_available = 128;
   base::RunLoop loop;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
+  std::unique_ptr<StrictMock<MockInputStreamReader>> stream_reader(
       new StrictMock<MockInputStreamReader>());
   EXPECT_CALL(*stream_reader, Seek(_))
       .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
@@ -394,7 +396,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWayRead) {
   const int offset = 20;
   const int bytes_available = 128;
   base::RunLoop loop;
-  scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
+  std::unique_ptr<StrictMock<MockInputStreamReader>> stream_reader(
       new StrictMock<MockInputStreamReader>());
   net::CompletionCallback read_completion_callback;
   EXPECT_CALL(*stream_reader, Seek(_))