Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/quic/quic_client_promised_info_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/quic_client_promised_info.h"
 
+#include <memory>
+
 #include "base/macros.h"
 #include "base/scoped_ptr.h"
 #include "net/gfe2/balsa_headers.h"
 #include "net/quic/quic_client.h"
 #include "net/quic/quic_client_session.h"
 #include "net/quic/quic_spdy_client_stream.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/spdy_balsa_utils.h"
 #include "net/quic/spdy_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
@@ skipping 46 matching lines @@
   bool authorized_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession);
 };
 
 class QuicClientPromisedInfoTest : public ::testing::Test {
  public:
   class StreamVisitor;
 
   QuicClientPromisedInfoTest()
-      : connection_(
-            new StrictMock<MockConnection>(&helper_, Perspective::IS_CLIENT)),
+      : connection_(new StrictMock<MockConnection>(&helper_,
+                                                   &alarm_factory_,
+                                                   Perspective::IS_CLIENT)),
         session_(connection_, &push_promise_index_),
         body_("hello world"),
         promise_id_(gfe_quic::test::kServerDataStreamId1) {
     FLAGS_quic_supports_push_promise = true;
 
     session_.Initialize();
 
     headers_.SetResponseFirstline("HTTP/1.1", 200, "Ok");
     headers_.ReplaceOrAppendHeader("content-length", "11");
     headers_string_ = SpdyBalsaUtils::SerializeResponseHeaders(headers_);
@@ skipping 50 matching lines @@
     QuicSpdyClientStream* rendezvous_stream_;
   };
 
   void ReceivePromise(QuicStreamId id) {
     stream_->OnStreamHeaders(serialized_push_promise_);
 
     stream_->OnPromiseHeadersComplete(id, serialized_push_promise_.size());
   }
 
   MockConnectionHelper helper_;
+  MockAlarmFactory alarm_factory_;
   StrictMock<MockConnection>* connection_;
   QuicClientPushPromiseIndex push_promise_index_;
 
   MockQuicClientSession session_;
   std::unique_ptr<QuicSpdyClientStream> stream_;
   std::unique_ptr<StreamVisitor> stream_visitor_;
   std::unique_ptr<QuicSpdyClientStream> promised_stream_;
   BalsaHeaders headers_;
   string headers_string_;
   string body_;
@@ skipping 14 matching lines @@
 TEST_F(QuicClientPromisedInfoTest, PushPromiseCleanupAlarm) {
   ReceivePromise(promise_id_);
 
   // Verify that the promise is in the unclaimed streams map.
   QuicClientPromisedInfo* promised = session_.GetPromisedById(promise_id_);
   ASSERT_NE(promised, nullptr);
 
   // Fire the alarm that will cancel the promised stream.
   EXPECT_CALL(*connection_,
               SendRstStream(promise_id_, QUIC_STREAM_CANCELLED, 0));
-  helper_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
+  alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
 
   // Verify that the promise is gone after the alarm fires.
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
   EXPECT_EQ(session_.GetPromisedByUrl(promise_url_), nullptr);
 }
 
 TEST_F(QuicClientPromisedInfoTest, PushPromiseInvalidMethod) {
   // Promise with an unsafe method
   push_promise_[":method"] = "PUT";
   serialized_push_promise_ =
@@ skipping 177 matching lines @@
   EXPECT_FALSE(delegate.rendezvous_fired());
   EXPECT_EQ(delegate.rendezvous_stream(), nullptr);
 
   // Promise is gone
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net