Convert //android_webview to use std::unique_ptr

android_webview/browser/net/android_stream_reader_url_request_job_unittest.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/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"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 46 matching lines @@
     return false;
   }
 };
 
 // Required in order to create an instance of AndroidStreamReaderURLRequestJob.
 class StreamReaderDelegate :
     public AndroidStreamReaderURLRequestJob::Delegate {
  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,
                                bool* restart) override {
     *restart = false;
   }
 
   bool GetMimeType(JNIEnv* env,
                    net::URLRequest* request,
                    android_webview::InputStream* stream,
@@ skipping 11 matching lines @@
   void AppendResponseHeaders(JNIEnv* env,
                              net::HttpResponseHeaders* headers) override {
     // no-op
   }
 };
 
 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;
   }
 };
 
 class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
  public:
   HeaderAlteringStreamReaderDelegate() {}
 
   void AppendResponseHeaders(JNIEnv* env,
                              net::HttpResponseHeaders* headers) override {
     headers->ReplaceStatusLine(kStatusLine);
@@ skipping 24 matching lines @@
 
   MOCK_METHOD1(Seek, int(const net::HttpByteRange& byte_range));
   MOCK_METHOD2(ReadRawData, int(net::IOBuffer* buffer, int buffer_size));
 };
 
 
 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)),
         stream_reader_(std::move(stream_reader)) {
     task_runner_ = base::ThreadTaskRunnerHandle::Get();
   }
 
   ~TestStreamReaderJob() override {}
 
-  scoped_ptr<InputStreamReader> CreateStreamReader(
+  std::unique_ptr<InputStreamReader> CreateStreamReader(
       InputStream* stream) override {
     return std::move(stream_reader_);
   }
 
  protected:
   base::TaskRunner* GetWorkerThreadRunner() override {
     return task_runner_.get();
   }
 
-  scoped_ptr<InputStreamReader> stream_reader_;
+  std::unique_ptr<InputStreamReader> stream_reader_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
 
 }  // namespace
 
 
 class AndroidStreamReaderURLRequestJobTest : public Test {
  public:
   AndroidStreamReaderURLRequestJobTest() {}
 
  protected:
   void SetUp() override {
     context_.set_job_factory(&factory_);
     context_.set_network_delegate(&network_delegate_);
     req_ = context_.CreateRequest(GURL("content://foo"),
                                   net::DEFAULT_PRIORITY,
                                   &url_request_delegate_);
     req_->set_method("GET");
   }
 
   void SetRange(net::URLRequest* req, int first_byte, int last_byte) {
     net::HttpRequestHeaders headers;
     headers.SetHeader(net::HttpRequestHeaders::kRange,
                       net::HttpByteRange::Bounded(
                           first_byte, last_byte).GetHeaderValue());
     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));
     DCHECK(set_protocol);
   }
 
   base::MessageLoopForIO loop_;
   TestURLRequestContext context_;
   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;
     EXPECT_CALL(*stream_reader, Seek(_))
         .WillOnce(Return(0));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Gt(0)))
         .WillOnce(Return(0));
   }
 
   SetUpTestJob(std::move(stream_reader));
 
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
   base::MessageLoop::current()->Run();
 
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   EXPECT_EQ(0, network_delegate_.error_count());
   EXPECT_EQ(200, req_->GetResponseCode());
 }
 
 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.
   base::MessageLoop::current()->Run();
 
   // The request_failed() method is named confusingly but all it checks is
   // whether the request got as far as calling NotifyHeadersComplete.
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   // A null input stream shouldn't result in an error. See crbug.com/180950.
   EXPECT_EQ(0, network_delegate_.error_count());
   EXPECT_EQ(404, req_->GetResponseCode());
 }
 
 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.
   base::MessageLoop::current()->Run();
 
   // The request_failed() method is named confusingly but all it checks is
   // whether the request got as far as calling NotifyHeadersComplete.
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   // A null input stream shouldn't result in an error. See crbug.com/180950.
   EXPECT_EQ(0, network_delegate_.error_count());
   EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kResponseCode,
             req_->GetResponseCode());
   EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kStatusLine,
             req_->response_headers()->GetStatusLine());
   EXPECT_TRUE(req_->response_headers()->HasHeader(
       HeaderAlteringStreamReaderDelegate::kCustomHeaderName));
   std::string header_value;
   EXPECT_TRUE(req_->response_headers()->EnumerateHeader(
       NULL, HeaderAlteringStreamReaderDelegate::kCustomHeaderName,
       &header_value));
   EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kCustomHeaderValue,
             header_value);
 }
 
 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;
     EXPECT_CALL(*stream_reader, Seek(_))
         .WillOnce(Return(bytes_available));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(bytes_to_read/2));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(bytes_to_read/2));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
@@ skipping 12 matching lines @@
   EXPECT_EQ(1, network_delegate_.completed_requests());
   EXPECT_EQ(0, network_delegate_.error_count());
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest,
        ReadStreamWithMoreAvailableThanActual) {
   const int bytes_available_reported = 190;
   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;
     EXPECT_CALL(*stream_reader, Seek(_))
         .WillOnce(Return(bytes_available_reported));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(bytes_available));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(0));
   }
 
   SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available_reported);
   req_->Start();
 
   base::MessageLoop::current()->Run();
 
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   EXPECT_EQ(0, network_delegate_.error_count());
 }
 
 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),
                       Return(bytes_available)));
   ON_CALL(*stream_reader, ReadRawData(_, _))
       .WillByDefault(Return(0));
 
   SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
 
   loop.Run();
 
   EXPECT_EQ(0, network_delegate_.completed_requests());
   req_->Cancel();
   EXPECT_EQ(1, network_delegate_.completed_requests());
 }
 
 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(_))
       .WillOnce(Return(bytes_available));
   EXPECT_CALL(*stream_reader, ReadRawData(_, _))
       .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
                       Return(bytes_available)));
 
   SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
 
   loop.Run();
 
   EXPECT_EQ(0, network_delegate_.completed_requests());
   req_->Cancel();
   EXPECT_EQ(1, network_delegate_.completed_requests());
 }
 
 }  // namespace android_webview