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

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 8cd2de0dbdf2a48d729226f74da1c951d6475426..bb725eaa64c61da1cde062f5f54ce1006b242f33 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -217,16 +217,14 @@ void HttpStreamFactoryImpl::Job::Orphan(const Request* request) {
     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);
   }
 }