JobController3: Move MarkAlternativeServiceBroken to job controller

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 492b8082167e0781f472927cb0ceaf7ee2cce7cc..33f6f5da17f5b3a8ae81deca063dbe58e4fea197 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -235,11 +235,17 @@ class HttpStreamFactoryImpl::Job {
   // will be orphaned.
   void ReportJobSucceededForRequest();
 
-  // Marks that the other |job| has completed.
-  virtual void MarkOtherJobComplete(const Job& job);
-
   JobType job_type() const { return job_type_; }
 
+  bool alternative_broken() const { return alternative_broken_; }
+
+  const AlternativeService alternative_service() const {
+    return alternative_service_;
+  }
+  const ProxyServer alternative_proxy_server() const {
+    return alternative_proxy_server_;
+  }
+
  private:
   friend class HttpStreamFactoryImplJobPeer;
 
@@ -281,13 +287,6 @@ class HttpStreamFactoryImpl::Job {
     STATE_NONE
   };
 
-  enum JobStatus {
-    STATUS_RUNNING,
-    STATUS_FAILED,
-    STATUS_BROKEN,
-    STATUS_SUCCEEDED
-  };
-
   void OnStreamReadyCallback();
   void OnBidirectionalStreamImplReadyCallback();
   void OnWebSocketHandshakeStreamReadyCallback();
@@ -380,13 +379,6 @@ class HttpStreamFactoryImpl::Job {
   // Should we force QUIC for this stream request.
   bool ShouldForceQuic() const;
 
-  void MaybeMarkAlternativeServiceBroken();
-
-  // May notify proxy delegate that the alternative proxy server is broken. The
-  // alternative proxy server is considered as broken if the alternative proxy
-  // server job failed, but the main job was successful.
-  void MaybeNotifyAlternativeProxyServerBroken() const;
-
   ClientSocketPoolManager::SocketGroupType GetSocketGroup() const;
 
   void MaybeCopyConnectionAttemptsFromSocketOrHandle();
@@ -426,12 +418,13 @@ class HttpStreamFactoryImpl::Job {
   // original request when host mapping rules are set-up.
   const GURL origin_url_;
 
+  // True if alternative service or alternative proxy server needs to be marked
+  // as broken.
+  bool alternative_broken_;

[Ryan Hamilton, 2016/09/13 23:23:15]

Is this different than the job failing?

+
   // AlternativeService for this Job if this is an alternative Job.
   const AlternativeService alternative_service_;
 
-  // AlternativeService for the other Job if this is not an alternative Job.
-  AlternativeService other_job_alternative_service_;
-
   // Unowned. |this| job is owned by |delegate_|.
   Delegate* delegate_;
 
@@ -439,9 +432,6 @@ class HttpStreamFactoryImpl::Job {
   // request.
   const ProxyServer alternative_proxy_server_;
 
-  // Alternative proxy server for the other job.
-  ProxyServer other_job_alternative_proxy_server_;
-
   const JobType job_type_;
 
   // True if handling a HTTPS request, or using SPDY with SSL
@@ -493,9 +483,6 @@ class HttpStreamFactoryImpl::Job {
   // Only used if |new_spdy_session_| is non-NULL.
   bool spdy_session_direct_;
 
-  JobStatus job_status_;
-  JobStatus other_job_status_;
-
   // Type of stream that is requested.
   HttpStreamRequest::StreamType stream_type_;