Misc cleanup.

Random small stuff I came across while working on push validation.

Bug: 554220
Change-Id: I58d43860b2f347b5df2833868ad8f906513e8f40
Reviewed-on: https://chromium-review.googlesource.com/728361Reviewed-by: Helen Li <xunjieli@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510253}

net/http/http_stream_factory_impl_job.cc

@@ -47,6 +47,7 @@
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/stream_socket.h"
 #include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/chromium/http2_push_promise_index.h"
 #include "net/spdy/chromium/spdy_http_stream.h"
 #include "net/spdy/chromium/spdy_session.h"
 #include "net/spdy/chromium/spdy_session_pool.h"
@@ -925,21 +926,21 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionImpl() {
   // connection this request can pool to.  If so, then go straight to using
   // that.
   if (CanUseExistingSpdySession()) {
-    base::WeakPtr<SpdySession> spdy_session =
+    existing_spdy_session_ =
         session_->spdy_session_pool()->push_promise_index()->Find(
             spdy_session_key_, origin_url_);
-    if (!spdy_session) {
-      spdy_session = session_->spdy_session_pool()->FindAvailableSession(
-          spdy_session_key_, enable_ip_based_pooling_, net_log_);
+    if (!existing_spdy_session_) {
+      existing_spdy_session_ =
+          session_->spdy_session_pool()->FindAvailableSession(
+              spdy_session_key_, enable_ip_based_pooling_, net_log_);
     }
-    if (spdy_session) {
+    if (existing_spdy_session_) {
       // If we're preconnecting, but we already have a SpdySession, we don't
       // actually need to preconnect any sockets, so we're done.
       if (job_type_ == PRECONNECT)
         return OK;
       using_spdy_ = true;
       next_state_ = STATE_CREATE_STREAM;
-      existing_spdy_session_ = spdy_session;
       return OK;
     }
   }
@@ -1200,15 +1201,15 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {
     existing_spdy_session_ =
         session_->spdy_session_pool()->push_promise_index()->Find(
             spdy_session_key_, origin_url_);
+    // It is also possible that an HTTP/2 connection has been established since
+    // last time Job checked above.
+    if (!existing_spdy_session_) {
+      existing_spdy_session_ =
+          session_->spdy_session_pool()->FindAvailableSession(
+              spdy_session_key_, enable_ip_based_pooling_, net_log_);
+    }
   }
-  // It is also possible that an HTTP/2 connection has been established since
-  // last time Job checked above.
-  if (!existing_spdy_session_) {
-    existing_spdy_session_ =
-        session_->spdy_session_pool()->FindAvailableSession(
-            spdy_session_key_, enable_ip_based_pooling_, net_log_);
-  }
-  if (existing_spdy_session_.get()) {
+  if (existing_spdy_session_) {
     // We picked up an existing session, so we don't need our socket.
     if (connection_->socket())
       connection_->socket()->Disconnect();

net/spdy/chromium/spdy_http_stream.cc

@@ -75,6 +75,8 @@ int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
     return ERR_CONNECTION_CLOSED;
 
   request_info_ = request_info;
+  // TODO(bnc): Remove this condition once pushed headers are properly
+  // validated.  https://crbug.com/554220.
   if (request_info_->method == "GET") {
     int error = spdy_session_->GetPushStream(request_info_->url, priority,
                                              &stream_, stream_net_log);

net/spdy/chromium/spdy_session.h

@@ -288,6 +288,8 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
     // already started to be pushed by the server, but do not have
     // consumers yet. Contains a subset of |active_streams_|.
     PushedStreamMap streams_;
+
+    DISALLOW_COPY_AND_ASSIGN(UnclaimedPushedStreamContainer);
   };
 
   // Returns true if |new_hostname| can be pooled into an existing connection to
@@ -573,14 +575,12 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // Allow tests to access our innards for testing purposes.
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ClientPing);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, FailedPing);
-  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GetActivePushStream);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, DeleteExpiredPushStreams);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, MetricsCollectionOnPushStreams);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, CancelPushBeforeClaimed);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, CancelPushAfterSessionGoesAway);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, CancelPushAfterExpired);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ProtocolNegotiation);
-  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ClearSettings);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustRecvWindowSize);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, AdjustSendWindowSize);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlInactiveStream);