Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/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/core/quic_client_promised_info.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/quic/core/spdy_utils.h"
@@ skipping 291 matching lines @@
   // Promise is still there, waiting for response.
   EXPECT_NE(session_.GetPromisedById(promise_id_), nullptr);
 
   // Create response stream, but no data yet.
   session_.GetOrCreateStream(promise_id_);
 
   // Fire the alarm that will cancel the promised stream.
   EXPECT_CALL(session_, CloseStream(promise_id_));
   EXPECT_CALL(*connection_,
               SendRstStream(promise_id_, QUIC_STREAM_CANCELLED, 0));
-  promised->Cancel();
+  alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
 
   // Promise is gone
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
 }
 
 TEST_F(QuicClientPromisedInfoTest, PushPromiseDataClosed) {
   ReceivePromise(promise_id_);
 
   QuicClientPromisedInfo* promised = session_.GetPromisedById(promise_id_);
   ASSERT_NE(promised, nullptr);
@@ skipping 21 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