Clean up HttpStreamFactoryImpl::JobController when Impl::Jobs complete

net/http/http_stream_factory_impl_job_controller.cc

 // 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.
 
 #include "net/http/http_stream_factory_impl_job_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 125 matching lines @@
   // Just pick the first one.
   return main_job_ ? main_job_->GetLoadState()
                    : alternative_job_->GetLoadState();
 }
 
 void HttpStreamFactoryImpl::JobController::OnRequestComplete() {
   CancelJobs();
   DCHECK(request_);
   request_ = nullptr;
   if (bound_job_) {
-    if (bound_job_->job_type() == MAIN) {
-      main_job_.reset();
-    } else {
-      DCHECK(bound_job_->job_type() == ALTERNATIVE);
-      alternative_job_.reset();
-    }
+    DCHECK(bound_job_->job_type() == MAIN ||
+           bound_job_->job_type() == ALTERNATIVE);
+    alternative_job_.reset();
+    main_job_.reset();

[Wez, 2017/01/06 18:21:44]

So IIUC the issue was that MaybeNotifyFactoryOfCompletion() would never notify
the factory if the alternative job completed, because the main_job is still
non-null, hence the JobController and Job, etc would be leaked?

Can we make that clearer in the CL description?

[Ryan Sleevi, 2017/01/06 20:24:13]

A big +1 to that. A longer CL description that covers the bug, how it
manifested, and what edge cases are being resolved would be a great idea :)

     bound_job_ = nullptr;
   }
   MaybeNotifyFactoryOfCompletion();
 }
 
 int HttpStreamFactoryImpl::JobController::RestartTunnelWithProxyAuth(
     const AuthCredentials& credentials) {
   DCHECK(bound_job_);
   return bound_job_->RestartTunnelWithProxyAuth(credentials);
 }
@@ skipping 917 matching lines @@
 }
 
 void HttpStreamFactoryImpl::JobController::StartAlternativeProxyServerJob() {
   if (!alternative_job_ || !request_)
     return;
   DCHECK(alternative_job_->alternative_proxy_server().is_valid());
   alternative_job_->Start(request_->stream_type());
 }
 
 }  // namespace net