Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/quic/core/quic_client_push_promise_index_test.cc

Index: net/quic/core/quic_client_push_promise_index_test.cc
diff --git a/net/quic/core/quic_client_push_promise_index_test.cc b/net/quic/core/quic_client_push_promise_index_test.cc
index 7f7633d24f3b01bc7334aa7d850a7279a596348a..0a93cf177e2f85dae120d974297939ec4ca3c7c8 100644
--- a/net/quic/core/quic_client_push_promise_index_test.cc
+++ b/net/quic/core/quic_client_push_promise_index_test.cc
@@ -10,6 +10,7 @@
 #include "net/quic/platform/api/quic_test.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_quic_client_promised_info.h"
+#include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/quic/quic_client_session.h"
 
@@ -50,7 +51,10 @@ class QuicClientPushPromiseIndexTest : public QuicTest {
                                                        &alarm_factory_,
                                                        Perspective::IS_CLIENT)),
         session_(connection_, &index_),
-        promised_(&session_, kServerDataStreamId1, url_) {
+        promised_(
+            &session_,
+            QuicSpdySessionPeer::GetNthServerInitiatedStreamId(session_, 0),
+            url_) {
     request_[":path"] = "/bar";
     request_[":authority"] = "www.google.com";
     request_[":version"] = "HTTP/1.1";