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

net/quic/core/quic_client_push_promise_index_test.cc

 // Copyright 2016 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/quic/core/quic_client_push_promise_index.h"
 
 #include <string>
 
 #include "net/quic/core/spdy_utils.h"
 #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"
 
 using testing::_;
 using testing::Return;
 using testing::StrictMock;
 using std::string;
 
 namespace net {
 namespace test {
@@ skipping 20 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession);
 };
 
 class QuicClientPushPromiseIndexTest : public QuicTest {
  public:
   QuicClientPushPromiseIndexTest()
       : connection_(new StrictMock<MockQuicConnection>(&helper_,
                                                        &alarm_factory_,
                                                        Perspective::IS_CLIENT)),
         session_(connection_, &index_),
-        promised_(
-            &session_,
-            QuicSpdySessionPeer::GetNthServerInitiatedStreamId(session_, 0),
-            url_) {
+        promised_(&session_, kServerDataStreamId1, url_) {
     request_[":path"] = "/bar";
     request_[":authority"] = "www.google.com";
     request_[":version"] = "HTTP/1.1";
     request_[":method"] = "GET";
     request_[":scheme"] = "https";
     url_ = SpdyUtils::GetUrlFromHeaderBlock(request_);
   }
 
   MockQuicConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
@@ skipping 36 matching lines @@
 }
 
 TEST_F(QuicClientPushPromiseIndexTest, GetPromise) {
   (*index_.promised_by_url())[url_] = &promised_;
   EXPECT_EQ(index_.GetPromised(url_), &promised_);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net