Remove some naked |new| statements in favor of MakeUnique.

net/url_request/url_request_http_job_unittest.cc

 // Copyright (c) 2013 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 "net/url_request/url_request_http_job.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <memory>
+#include <utility>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/test/histogram_tester.h"
 #include "net/base/auth.h"
 #include "net/base/request_priority.h"
@@ skipping 106 matching lines @@
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   std::unique_ptr<URLRequest> request =
       context_.CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                              &delegate_, TRAFFIC_ANNOTATION_FOR_TESTS);
-  std::unique_ptr<TestURLRequestHttpJob> job(
-      new TestURLRequestHttpJob(request.get()));
+  auto job = base::MakeUnique<TestURLRequestHttpJob>(request.get());
   job->set_use_null_source_stream(true);
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
   EXPECT_EQ(ERR_CONTENT_DECODING_INIT_FAILED, delegate_.request_status());
 }
 
 // Tests that if there is an unknown content-encoding type, the raw response
 // body is passed through.
 TEST_F(URLRequestHttpJobSetUpSourceTest, UnknownEncoding) {
   MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Encoding: foo, gzip\r\n"
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   std::unique_ptr<URLRequest> request =
       context_.CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                              &delegate_, TRAFFIC_ANNOTATION_FOR_TESTS);
-  std::unique_ptr<TestURLRequestHttpJob> job(
-      new TestURLRequestHttpJob(request.get()));
+  auto job = base::MakeUnique<TestURLRequestHttpJob>(request.get());
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
   EXPECT_EQ(OK, delegate_.request_status());
   EXPECT_EQ("Test Content", delegate_.data_received());
 }
 
 // Received a malformed SDCH encoded response when there is no SdchManager.
 TEST_F(URLRequestHttpJobSetUpSourceTest, SdchNotAdvertisedGotSdchResponse) {
   MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Encoding: sdch\r\n"
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   // This test expects TestURLRequestContexts to have no SdchManager.
   DCHECK(!context_.sdch_manager());
 
   std::unique_ptr<URLRequest> request =
       context_.CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                              &delegate_, TRAFFIC_ANNOTATION_FOR_TESTS);
-  std::unique_ptr<TestURLRequestHttpJob> job(
-      new TestURLRequestHttpJob(request.get()));
+  auto job = base::MakeUnique<TestURLRequestHttpJob>(request.get());
   test_job_interceptor_->set_main_intercept_job(std::move(job));
   request->Start();
 
   base::RunLoop().Run();
   EXPECT_EQ(ERR_CONTENT_DECODING_FAILED, delegate_.request_status());
 }
 
 class URLRequestHttpJobTest : public ::testing::Test {
  protected:
   URLRequestHttpJobTest() : context_(true) {
@@ skipping 33 matching lines @@
     for (const std::string& token :
          base::SplitString(encoding_headers, ", ", base::KEEP_WHITESPACE,
                            base::SPLIT_WANT_NONEMPTY)) {
       if (base::EqualsCaseInsensitiveASCII(token, "sdch"))
         return true;
     }
     return false;
   }
 
   void EnableSdch() {
-    context_.SetSdchManager(std::unique_ptr<SdchManager>(new SdchManager));
+    context_.SetSdchManager(base::MakeUnique<SdchManager>());
   }
 
   MockNetworkLayer network_layer_;
 
   // |test_job_interceptor_| is owned by |test_job_factory_|.
   TestJobInterceptor* test_job_interceptor_;
   URLRequestJobFactoryImpl test_job_factory_;
 
   TestURLRequestContext context_;
   TestDelegate delegate_;
@@ skipping 437 matching lines @@
   request->Start();
   request->Cancel();
   base::RunLoop().Run();
 
   EXPECT_THAT(delegate.request_status(), IsError(ERR_ABORTED));
 }
 
 // Make sure that SetPriority actually sets the URLRequestHttpJob's
 // priority, before start.  Other tests handle the after start case.
 TEST_F(URLRequestHttpJobTest, SetPriorityBasic) {
-  std::unique_ptr<TestURLRequestHttpJob> job(
-      new TestURLRequestHttpJob(req_.get()));
+  auto job = base::MakeUnique<TestURLRequestHttpJob>(req_.get());
   EXPECT_EQ(DEFAULT_PRIORITY, job->priority());
 
   job->SetPriority(LOWEST);
   EXPECT_EQ(LOWEST, job->priority());
 
   job->SetPriority(LOW);
   EXPECT_EQ(LOW, job->priority());
 }
 
 // Make sure that URLRequestHttpJob passes on its priority to its
 // transaction on start.
 TEST_F(URLRequestHttpJobTest, SetTransactionPriorityOnStart) {
   test_job_interceptor_->set_main_intercept_job(
-      base::WrapUnique(new TestURLRequestHttpJob(req_.get())));
+      base::MakeUnique<TestURLRequestHttpJob>(req_.get()));
   req_->SetPriority(LOW);
 
   EXPECT_FALSE(network_layer_.last_transaction());
 
   req_->Start();
 
   ASSERT_TRUE(network_layer_.last_transaction());
   EXPECT_EQ(LOW, network_layer_.last_transaction()->priority());
 }
 
 // Make sure that URLRequestHttpJob passes on its priority updates to
 // its transaction.
 TEST_F(URLRequestHttpJobTest, SetTransactionPriority) {
   test_job_interceptor_->set_main_intercept_job(
-      base::WrapUnique(new TestURLRequestHttpJob(req_.get())));
+      base::MakeUnique<TestURLRequestHttpJob>(req_.get()));
   req_->SetPriority(LOW);
   req_->Start();
   ASSERT_TRUE(network_layer_.last_transaction());
   EXPECT_EQ(LOW, network_layer_.last_transaction()->priority());
 
   req_->SetPriority(HIGHEST);
   EXPECT_EQ(HIGHEST, network_layer_.last_transaction()->priority());
 }
 
 // Confirm we do advertise SDCH encoding in the case of a GET.
 TEST_F(URLRequestHttpJobTest, SdchAdvertisementGet) {
   EnableSdch();
   req_->set_method("GET");  // Redundant with default.
   test_job_interceptor_->set_main_intercept_job(
-      base::WrapUnique(new TestURLRequestHttpJob(req_.get())));
+      base::MakeUnique<TestURLRequestHttpJob>(req_.get()));
   req_->Start();
   EXPECT_TRUE(TransactionAcceptsSdchEncoding());
 }
 
 // Confirm we don't advertise SDCH encoding in the case of a POST.
 TEST_F(URLRequestHttpJobTest, SdchAdvertisementPost) {
   EnableSdch();
   req_->set_method("POST");
   test_job_interceptor_->set_main_intercept_job(
-      base::WrapUnique(new TestURLRequestHttpJob(req_.get())));
+      base::MakeUnique<TestURLRequestHttpJob>(req_.get()));
   req_->Start();
   EXPECT_FALSE(TransactionAcceptsSdchEncoding());
 }
 
 TEST_F(URLRequestHttpJobTest, HSTSInternalRedirectTest) {
   // Setup HSTS state.
   context_.transport_security_state()->AddHSTS(
       "upgrade.test", base::Time::Now() + base::TimeDelta::FromSeconds(10),
       true);
   ASSERT_TRUE(
@@ skipping 60 matching lines @@
   MOCK_METHOD1(OnDictionaryRemoved, void(const std::string& server_hash));
   MOCK_METHOD1(OnDictionaryUsed, void(const std::string& server_hash));
   MOCK_METHOD2(OnGetDictionary,
                void(const GURL& request_url, const GURL& dictionary_url));
   MOCK_METHOD0(OnClearDictionaries, void());
 };
 
 class URLRequestHttpJobWithSdchSupportTest : public ::testing::Test {
  protected:
   URLRequestHttpJobWithSdchSupportTest() : context_(true) {
-    std::unique_ptr<HttpNetworkSession::Params> params(
-        new HttpNetworkSession::Params);
+    auto params = base::MakeUnique<HttpNetworkSession::Params>();
     context_.set_http_network_session_params(std::move(params));
     context_.set_client_socket_factory(&socket_factory_);
     context_.Init();
   }
 
   MockClientSocketFactory socket_factory_;
   TestURLRequestContext context_;
 };
 
 // Received a malformed SDCH encoded response that has no valid dictionary id.
@@ skipping 81 matching lines @@
   EXPECT_THAT(delegate2.request_status(), IsOk());
 
   // Cleanup manager.
   sdch_manager.RemoveObserver(&sdch_observer);
 }
 
 class URLRequestHttpJobWithBrotliSupportTest : public ::testing::Test {
  protected:
   URLRequestHttpJobWithBrotliSupportTest()
       : context_(new TestURLRequestContext(true)) {
-    std::unique_ptr<HttpNetworkSession::Params> params(
-        new HttpNetworkSession::Params);
+    auto params = base::MakeUnique<HttpNetworkSession::Params>();
     context_->set_enable_brotli(true);
     context_->set_http_network_session_params(std::move(params));
     context_->set_client_socket_factory(&socket_factory_);
     context_->Init();
   }
 
   MockClientSocketFactory socket_factory_;
   std::unique_ptr<TestURLRequestContext> context_;
 };
 
@@ skipping 235 matching lines @@
   bool initialize_stream_was_called_;
 };
 
 TEST_F(URLRequestHttpJobWebSocketTest, RejectedWithoutCreateHelper) {
   req_->Start();
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(delegate_.request_status(), IsError(ERR_DISALLOWED_URL_SCHEME));
 }
 
 TEST_F(URLRequestHttpJobWebSocketTest, CreateHelperPassedThrough) {
-  std::unique_ptr<MockCreateHelper> create_helper(
-      new ::testing::StrictMock<MockCreateHelper>());
+  std::unique_ptr<MockCreateHelper> create_helper =
+      base::MakeUnique<::testing::StrictMock<MockCreateHelper>>();
   FakeWebSocketHandshakeStream* fake_handshake_stream(
       new FakeWebSocketHandshakeStream);
   // Ownership of fake_handshake_stream is transferred when CreateBasicStream()
   // is called.
   EXPECT_CALL(*create_helper, CreateBasicStreamMock())
       .WillOnce(Return(fake_handshake_stream));
   req_->SetUserData(WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
                     std::move(create_helper));
   req_->SetLoadFlags(LOAD_DISABLE_CACHE);
   req_->Start();
   base::RunLoop().RunUntilIdle();
   EXPECT_THAT(delegate_.request_status(), IsError(ERR_IO_PENDING));
   EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called());
 }
 
 #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
 
 }  // namespace
 
 }  // namespace net