Cleanup the preconnect to proxy code and Job controller code

net/http/http_stream_factory_impl_job_controller.cc

Index: net/http/http_stream_factory_impl_job_controller.cc
diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
index 38b9428937f1c49ed1d835d4dc7a96158fb1cd20..7e76ce5ce3436767ba5f47262d75ec4dbcaf16b8 100644
--- a/net/http/http_stream_factory_impl_job_controller.cc
+++ b/net/http/http_stream_factory_impl_job_controller.cc
@@ -172,12 +172,8 @@ void HttpStreamFactoryImpl::JobController::SetPriority(
 
 void HttpStreamFactoryImpl::JobController::OnStreamReady(
     Job* job,
-    const SSLConfig& used_ssl_config,
-    const ProxyInfo& used_proxy_info) {
+    const SSLConfig& used_ssl_config) {
   DCHECK(job);
-  // TODO(tbansal): Remove |used_proxy_info| from the method arguments.
-  DCHECK(job->proxy_info().is_empty() == used_proxy_info.is_empty() ||
-         job->proxy_info().proxy_server() == used_proxy_info.proxy_server());
 
   factory_->OnStreamReady(job->proxy_info());
 
@@ -197,7 +193,7 @@ void HttpStreamFactoryImpl::JobController::OnStreamReady(
   DCHECK(!factory_->for_websockets_);
   DCHECK_EQ(HttpStreamRequest::HTTP_STREAM, request_->stream_type());
   OnJobSucceeded(job);
-  request_->OnStreamReady(used_ssl_config, used_proxy_info, stream.release());
+  request_->OnStreamReady(used_ssl_config, job->proxy_info(), stream.release());
 }
 
 void HttpStreamFactoryImpl::JobController::OnBidirectionalStreamImplReady(