Re-write many calls to WrapUnique() with MakeUnique()

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"
@@ skipping 62 matching lines @@
 };
 
 // Required in order to create an instance of AndroidStreamReaderURLRequestJob.
 class StreamReaderDelegate :
     public AndroidStreamReaderURLRequestJob::Delegate {
  public:
   StreamReaderDelegate() {}
 
   std::unique_ptr<InputStream> OpenInputStream(JNIEnv* env,
                                                const GURL& url) override {
-    return base::WrapUnique(new NotImplInputStream());
+    return base::MakeUnique<NotImplInputStream>();
   }
 
   void OnInputStreamOpenFailed(net::URLRequest* request,
                                bool* restart) override {
     *restart = false;
   }
 
   bool GetMimeType(JNIEnv* env,
                    net::URLRequest* request,
                    android_webview::InputStream* stream,
@@ skipping 110 matching lines @@
   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(std::unique_ptr<InputStreamReader> stream_reader) {
     SetUpTestJob(std::move(stream_reader),
-                 base::WrapUnique(new StreamReaderDelegate()));
+                 base::MakeUnique<StreamReaderDelegate>());
   }
 
   void SetUpTestJob(std::unique_ptr<InputStreamReader> stream_reader,
                     std::unique_ptr<AndroidStreamReaderURLRequestJob::Delegate>
                         stream_reader_delegate) {
     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_|.
@@ skipping 31 matching lines @@
   // 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, base::WrapUnique(new NullStreamReaderDelegate()));
+  SetUpTestJob(nullptr, base::MakeUnique<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,
-               base::WrapUnique(new HeaderAlteringStreamReaderDelegate()));
+  SetUpTestJob(nullptr, base::MakeUnique<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.
@@ skipping 117 matching lines @@
   req_->Start();
 
   loop.Run();
 
   EXPECT_EQ(0, network_delegate_.completed_requests());
   req_->Cancel();
   EXPECT_EQ(1, network_delegate_.completed_requests());
 }
 
 }  // namespace android_webview