Revert of Remove unreachable code in HttpStreamFactoryImpl::Job::Orphan

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"
@@ skipping 118 matching lines @@
       const SSLConfig& server_ssl_config,
       const SSLConfig& proxy_ssl_config,
       HttpStreamRequest::StreamType stream_type) override;
 
   // Invoked to notify the Request and Factory of the readiness of new
   // SPDY session.
   void OnNewSpdySessionReady(Job* job,
                              const base::WeakPtr<SpdySession>& spdy_session,
                              bool direct) override;
 
+  // Invoked when the orphaned |job| finishes.
+  void OnOrphanedJobComplete(const Job* job) override;
+
   // Invoked when the |job| finishes pre-connecting sockets.
   void OnPreconnectsComplete(Job* job) override;
 
   // Invoked to record connection attempts made by the socket layer to
   // Request if |job| is associated with Request.
   void AddConnectionAttemptsToRequest(
       Job* job,
       const ConnectionAttempts& attempts) override;
 
   // Invoked when |job| finishes initiating a connection.
   // Resume the other job if there's an error raised.
   void OnConnectionInitialized(Job* job, int rv) override;
 
   // Return false if |job| can advance to the next state. Otherwise, |job|
   // will wait for Job::Resume() to be called before advancing.
   bool ShouldWait(Job* job) override;
 
   // 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() const 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;
@@ skipping 21 matching lines @@
 
   // Called when |request_| is destructed.
   // Job(s) associated with but not bound to |request_| will be deleted.
   void CancelJobs();
 
   // Called after BindJob() to notify the unbound job that its result should be
   // ignored by JobController. The unbound job can be canceled or continue until
   // completion.
   void OrphanUnboundJob();
 
-  // Invoked when the orphaned |job| finishes.
-  void OnOrphanedJobComplete(const Job* job);
-
   // Called when a Job succeeds.
   void OnJobSucceeded(Job* job);
 
   // Marks completion of the |request_|.
   void MarkRequestComplete(bool was_alpn_negotiated,
                            NextProto negotiated_protocol,
                            bool using_spdy);
 
   // Must be called when the alternative job fails. |net_error| is the net error
   // of the failed alternative job.
@@ skipping 111 matching lines @@
   PrivacyMode privacy_mode_;
 
   const NetLogWithSource net_log_;
 
   base::WeakPtrFactory<JobController> ptr_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_