Improve HttpStreamFactory NetLog events

net/http/http_stream_factory_impl_job_controller.h

 // Copyright (c) 2016 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.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_
 
 #include "net/base/host_port_pair.h"
 #include "net/base/privacy_mode.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_request.h"
 
 namespace net {
 
 class NetLogWithSource;
 
 // HttpStreamFactoryImpl::JobController manages Request and Job(s).
 class HttpStreamFactoryImpl::JobController
     : public HttpStreamFactoryImpl::Job::Delegate,
       public HttpStreamFactoryImpl::Request::Helper {
  public:
   JobController(HttpStreamFactoryImpl* factory,
                 HttpStreamRequest::Delegate* delegate,
                 HttpNetworkSession* session,
-                JobFactory* job_factory);
+                JobFactory* job_factory,
+                const HttpRequestInfo& request_info,
+                bool is_preconnect);
 
   ~JobController() override;
 
   bool for_websockets() override;
 
   // Used in tests only for verification purpose.
   const Job* main_job() const { return main_job_.get(); }
   const Job* alternative_job() const { return alternative_job_.get(); }
 
   GURL ApplyHostMappingRules(const GURL& url, HostPortPair* endpoint);
 
   // Methods below are called by HttpStreamFactoryImpl only.
   // Creates request and hands out to HttpStreamFactoryImpl, this will also
   // create Job(s) and start serving the created request.
   Request* Start(const HttpRequestInfo& request_info,
                  HttpStreamRequest::Delegate* delegate,
                  WebSocketHandshakeStreamBase::CreateHelper*
                      websocket_handshake_stream_create_helper,
-                 const NetLogWithSource& net_log,
+                 const NetLogWithSource& source_net_log,
                  HttpStreamRequest::StreamType stream_type,
                  RequestPriority priority,
                  const SSLConfig& server_ssl_config,
                  const SSLConfig& proxy_ssl_config);
 
   void Preconnect(int num_streams,
                   const HttpRequestInfo& request_info,
                   const SSLConfig& server_ssl_config,
                   const SSLConfig& proxy_ssl_config);
 
@@ skipping 99 matching lines @@
 
   // Called when |job| determines the appropriate |spdy_session_key| for the
   // Request. Note that this does not mean that SPDY is necessarily supported
   // for this SpdySessionKey, since we may need to wait for NPN to complete
   // before knowing if SPDY is available.
   void SetSpdySessionKey(Job* job,
                          const SpdySessionKey& spdy_session_key) override;
 
   // Remove session from the SpdySessionRequestMap.
   void RemoveRequestFromSpdySessionRequestMapForJob(Job* job) override;
+
   const NetLogWithSource* GetNetLog(Job* job) const override;
 
   void MaybeSetWaitTimeForMainJob(const base::TimeDelta& delay) override;
 
   WebSocketHandshakeStreamBase::CreateHelper*
   websocket_handshake_stream_create_helper() override;
 
   bool is_preconnect() const { return is_preconnect_; }
 
   // Returns true if |this| has a pending main job that is not completed.
   bool HasPendingMainJob() const;
 
   // Returns true if |this| has a pending alternative job that is not completed.
   bool HasPendingAltJob() const;
 
   // Returns the estimated memory usage in bytes.
   size_t EstimateMemoryUsage() const;
 
  private:
   friend class JobControllerPeer;
 
   // Creates Job(s) for |request_|. Job(s) will be owned by |this|.
   void CreateJobs(const HttpRequestInfo& request_info,
                   RequestPriority priority,
                   const SSLConfig& server_ssl_config,
                   const SSLConfig& proxy_ssl_config,
                   HttpStreamRequest::Delegate* delegate,
-                  HttpStreamRequest::StreamType stream_type,
-                  const NetLogWithSource& net_log);
+                  HttpStreamRequest::StreamType stream_type);
 
   // Attaches |job| to |request_|. Does not mean that |request_| will use |job|.
   void AttachJob(Job* job);
 
   // Called to bind |job| to the |request_| and orphan all other jobs that are
   // still associated with |request_|.
   void BindJob(Job* job);
 
   // Called when |request_| is destructed.
   // Job(s) associated with but not bound to |request_| will be deleted.
@@ skipping 70 matching lines @@
 
   // Request will be handed out to factory once created. This just keeps an
   // reference and is safe as |request_| will notify |this| JobController
   // when it's destructed by calling OnRequestComplete(), which nulls
   // |request_|.
   Request* request_;
 
   HttpStreamRequest::Delegate* const delegate_;
 
   // True if this JobController is used to preconnect streams.
-  bool is_preconnect_;
+  const bool is_preconnect_;
 
   // |main_job_| is a job waiting to see if |alternative_job_| can reuse a
   // connection. If |alternative_job_| is unable to do so, |this| will notify
   // |main_job_| to proceed and then race the two jobs.
   std::unique_ptr<Job> main_job_;
   std::unique_ptr<Job> alternative_job_;
 
   // Net error code of the failed alternative job. Set to OK by default.
   int alternative_job_net_error_;
 
@@ skipping 14 matching lines @@
   // At the point where a Job is irrevocably tied to |request_|, we set this.
   // It will be nulled when the |request_| is finished.
   Job* bound_job_;
 
   // True if an alternative proxy server job can be started to fetch |request_|.
   bool can_start_alternative_proxy_job_;
 
   // Privacy mode that should be used for fetching the resource.
   PrivacyMode privacy_mode_;
 
+  const NetLogWithSource net_log_;
+
   base::WeakPtrFactory<JobController> ptr_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_