JobController 1: Adding a new class HttpStreamFactoryImpl::JobController

net/http/http_stream_factory_impl_job.h

Index: net/http/http_stream_factory_impl_job.h
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index c7c69f0602705b9fab565011633829c4f8d6f3f3..7341379f7b29ceddcacded52046b597099728b92 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -41,7 +41,7 @@ class QuicHttpStream;
 class HttpStreamFactoryImpl::Job {
  public:
   // Constructor for non-alternative Job.
-  Job(HttpStreamFactoryImpl* stream_factory,
+  Job(JobController* job_controller,

[Randy Smith (Not in Mondays), 2016/05/09 20:42:18]

nit, suggestion: I have a bit of a reflex for asking for a comment explaining
why storing an unowned pointer is ok.  Here it would be something like "Job is
owned by JobController, hence this pointer is valid for the lifetime of the
Job."

[Zhongyi Shi, 2016/05/12 07:26:23]

Done.

       HttpNetworkSession* session,
       const HttpRequestInfo& request_info,
       RequestPriority priority,
@@ -51,7 +51,7 @@ class HttpStreamFactoryImpl::Job {
       GURL origin_url,
       NetLog* net_log);
   // Constructor for alternative Job.
-  Job(HttpStreamFactoryImpl* stream_factory,
+  Job(JobController* job_controller,
       HttpNetworkSession* session,
       const HttpRequestInfo& request_info,
       RequestPriority priority,
@@ -103,7 +103,7 @@ class HttpStreamFactoryImpl::Job {
   bool IsPreconnecting() const;
 
   // Indicates whether or not this Job has been orphaned by a Request.
-  bool IsOrphaned() const;
+  bool IsOrphaned() const { return orphaned_; };
 
   // Called to indicate that this job succeeded, and some other jobs
   // will be orphaned.
@@ -318,8 +318,6 @@ class HttpStreamFactoryImpl::Job {
                               const AddressList& addresses,
                               const BoundNetLog& net_log);
 
-  Request* request_;
-
   const HttpRequestInfo request_info_;
   RequestPriority priority_;
   ProxyInfo proxy_info_;
@@ -330,7 +328,6 @@ class HttpStreamFactoryImpl::Job {
   CompletionCallback io_callback_;
   std::unique_ptr<ClientSocketHandle> connection_;
   HttpNetworkSession* const session_;
-  HttpStreamFactoryImpl* const stream_factory_;
   State next_state_;
   ProxyService::PacRequest* pac_request_;
   SSLInfo ssl_info_;
@@ -349,6 +346,8 @@ class HttpStreamFactoryImpl::Job {
   // AlternativeService for the other Job if this is not an alternative Job.
   AlternativeService other_job_alternative_service_;
 
+  JobController* job_controller_;

[Ryan Hamilton, 2016/05/06 20:49:01]

nit: // Unowned.

[Zhongyi Shi, 2016/05/12 07:26:23]

Done.

+
   // This is the Job we're dependent on. It will notify us if/when it's OK to
   // proceed.
   Job* blocking_job_;
@@ -360,6 +359,9 @@ class HttpStreamFactoryImpl::Job {
 
   base::TimeDelta wait_time_;
 
+  // True if this job has been launched by a request but orphaned.
+  bool orphaned_;
+
   // True if handling a HTTPS request, or using SPDY with SSL
   bool using_ssl_;