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

net/quic/core/quic_client_promised_info_test.cc

Index: net/quic/core/quic_client_promised_info_test.cc
diff --git a/net/quic/core/quic_client_promised_info_test.cc b/net/quic/core/quic_client_promised_info_test.cc
index f4fa2d67f964804619d2a4603a4f0b052788ac48..954f21b44255a5a4bf4e285c9abb4488f1e47af2 100644
--- a/net/quic/core/quic_client_promised_info_test.cc
+++ b/net/quic/core/quic_client_promised_info_test.cc
@@ -13,6 +13,7 @@
 #include "net/quic/platform/api/quic_test.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_client_promised_info_peer.h"
+#include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/test/gtest_util.h"
 #include "net/tools/quic/quic_client_session.h"
 
@@ -61,13 +62,15 @@ class QuicClientPromisedInfoTest : public QuicTest {
                                                        Perspective::IS_CLIENT)),
         session_(connection_, &push_promise_index_),
         body_("hello world"),
-        promise_id_(kServerDataStreamId1) {
+        promise_id_(kInvalidStreamId) {
     session_.Initialize();
 
     headers_[":status"] = "200";
     headers_["content-length"] = "11";
 
-    stream_.reset(new QuicSpdyClientStream(kClientDataStreamId1, &session_));
+    stream_.reset(new QuicSpdyClientStream(
+        QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0),
+        &session_));
     stream_visitor_.reset(new StreamVisitor());
     stream_->set_visitor(stream_visitor_.get());
 
@@ -80,6 +83,8 @@ class QuicClientPromisedInfoTest : public QuicTest {
     promise_url_ = SpdyUtils::GetUrlFromHeaderBlock(push_promise_);
 
     client_request_ = push_promise_.Clone();
+    promise_id_ =
+        QuicSpdySessionPeer::GetNthServerInitiatedStreamId(session_, 0);
   }
 
   class StreamVisitor : public QuicSpdyClientStream::Visitor {