Tiny refactor of HttpStreamFactoryImpl::Job::Orphan to simplify the code.

net/http/http_stream_factory_impl_job.cc

 // Copyright (c) 2012 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.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 198 matching lines @@
 }
 
 void HttpStreamFactoryImpl::Job::Orphan(const Request* request) {
   DCHECK_EQ(request_, request);
   request_ = NULL;
   if (blocking_job_) {
     // We've been orphaned, but there's a job we're blocked on. Don't bother
     // racing, just cancel ourself.
     DCHECK(blocking_job_->waiting_job_);
     blocking_job_->waiting_job_ = NULL;
     blocking_job_ = NULL;

[mmenke, 2014/05/15 18:30:21]

We're no longer calling OnOrphanedJobComplete in the case there was a
blocking_job_ but this isn't a websockets request?  Is that deliberate?

[Ryan Hamilton, 2014/05/15 18:47:39]

ARGH! No, this was *not* intentional. I misread the initial code because of the
lack of {}s. Ok, I've reverted the change, but added {}s so the next reader is
not confused.

Thanks for catching this. (Annoyingly, no tests failed)

-    if (stream_factory_->for_websockets_ &&
-        connection_ && connection_->socket())
-      connection_->socket()->Disconnect();
-    stream_factory_->OnOrphanedJobComplete(this);
-  } else if (stream_factory_->for_websockets_) {
+  }
+
+   if (stream_factory_->for_websockets_ &&
+       connection_ && connection_->socket()) {
+     connection_->socket()->Disconnect();
     // We cancel this job because a WebSocketHandshakeStream can't be created
     // without a WebSocketHandshakeStreamBase::CreateHelper which is stored in
     // the Request class and isn't accessible from this job.
-    if (connection_ && connection_->socket())
-      connection_->socket()->Disconnect();
     stream_factory_->OnOrphanedJobComplete(this);
   }
 }
 
 void HttpStreamFactoryImpl::Job::SetPriority(RequestPriority priority) {
   priority_ = priority;
   // TODO(akalin): Propagate this to |connection_| and maybe the
   // preconnect state.
 }
 
@@ skipping 1250 matching lines @@
       (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH |
        net::LOAD_IS_DOWNLOAD)) {
     // Avoid pipelining resources that may be streamed for a long time.
     return false;
   }
   return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining(
       *http_pipelining_key_.get());
 }
 
 }  // namespace net