Improve HttpStreamFactory NetLog events

net/http/http_stream_factory_impl.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 "net/http/http_stream_factory_impl.h"
 
 #include <string>
 #include <tuple>
 
 #include "base/logging.h"
@@ skipping 141 matching lines @@
 HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal(
     const HttpRequestInfo& request_info,
     RequestPriority priority,
     const SSLConfig& server_ssl_config,
     const SSLConfig& proxy_ssl_config,
     HttpStreamRequest::Delegate* delegate,
     WebSocketHandshakeStreamBase::CreateHelper*
         websocket_handshake_stream_create_helper,
     HttpStreamRequest::StreamType stream_type,
     const NetLogWithSource& net_log) {
-  JobController* job_controller =
-      new JobController(this, delegate, session_, job_factory_.get());
-  job_controller_set_.insert(base::WrapUnique(job_controller));
-
-  Request* request = job_controller->Start(
+  std::unique_ptr<JobController> job_controller =
+      base::MakeUnique<JobController>(this, delegate, session_,
+                                      job_factory_.get(), request_info,
+                                      /*is_preconnect=*/false);
+  JobController* job_controller_raw_ptr = job_controller.get();
+  job_controller_set_.insert(std::move(job_controller));
+  Request* request = job_controller_raw_ptr->Start(
       request_info, delegate, websocket_handshake_stream_create_helper, net_log,
       stream_type, priority, server_ssl_config, proxy_ssl_config);
 
   return request;
 }
 
 void HttpStreamFactoryImpl::PreconnectStreams(
     int num_streams,
     const HttpRequestInfo& request_info) {
   SSLConfig server_ssl_config;
   SSLConfig proxy_ssl_config;
   session_->GetSSLConfig(request_info, &server_ssl_config, &proxy_ssl_config);
   // All preconnects should perform EV certificate verification.
   server_ssl_config.verify_ev_cert = true;
   proxy_ssl_config.verify_ev_cert = true;
 
   DCHECK(!for_websockets_);
 
-  JobController* job_controller =
-      new JobController(this, nullptr, session_, job_factory_.get());
-  job_controller_set_.insert(base::WrapUnique(job_controller));
-  job_controller->Preconnect(num_streams, request_info, server_ssl_config,
-                             proxy_ssl_config);
+  std::unique_ptr<JobController> job_controller =
+      base::MakeUnique<JobController>(this, nullptr, session_,
+                                      job_factory_.get(), request_info,
+                                      /*is_preconnect=*/true);
+  JobController* job_controller_raw_ptr = job_controller.get();
+  job_controller_set_.insert(std::move(job_controller));
+  job_controller_raw_ptr->Preconnect(num_streams, request_info,
+                                     server_ssl_config, proxy_ssl_config);
 }
 
 const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
   return session_->params().host_mapping_rules;
 }
 
 void HttpStreamFactoryImpl::OnNewSpdySessionReady(
     const base::WeakPtr<SpdySession>& spdy_session,
     bool direct,
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     bool was_alpn_negotiated,
     NextProto negotiated_protocol,
-    bool using_spdy,
-    const NetLogWithSource& net_log) {
+    bool using_spdy) {
   while (true) {
     if (!spdy_session)
       break;
     const SpdySessionKey& spdy_session_key = spdy_session->spdy_session_key();
     // Each iteration may empty out the RequestSet for |spdy_session_key| in
     // |spdy_session_request_map_|. So each time, check for RequestSet and use
     // the first one.
     //
     // TODO(willchan): If it's important, switch RequestSet out for a FIFO
     // queue (Order by priority first, then FIFO within same priority). Unclear
@@ skipping 155 matching lines @@
   factory_dump->AddScalar("main_job_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           main_job_count);
   // The number of preconnect controllers.
   factory_dump->AddScalar("preconnect_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           preconnect_controller_count);
 }
 
 }  // namespace net