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

net/tools/quic/test_tools/packet_dropping_test_writer.cc

 // Copyright 2013 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/tools/quic/test_tools/packet_dropping_test_writer.h"
 
 #include <limits>
 
 #include "base/rand_util.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
@@ skipping 48 matching lines @@
       fake_bandwidth_(QuicBandwidth::Zero()),
       buffer_size_(0) {
   uint32_t seed = base::RandInt(0, std::numeric_limits<int32_t>::max());
   VLOG(1) << "Seeding packet loss with " << seed;
   simple_random_.set_seed(seed);
 }
 
 PacketDroppingTestWriter::~PacketDroppingTestWriter() {}
 
 void PacketDroppingTestWriter::Initialize(QuicConnectionHelperInterface* helper,
+                                          QuicAlarmFactory* alarm_factory,
                                           Delegate* on_can_write) {
   clock_ = helper->GetClock();
   write_unblocked_alarm_.reset(
-      helper->CreateAlarm(new WriteUnblockedAlarm(this)));
-  delay_alarm_.reset(helper->CreateAlarm(new DelayAlarm(this)));
+      alarm_factory->CreateAlarm(new WriteUnblockedAlarm(this)));
+  delay_alarm_.reset(alarm_factory->CreateAlarm(new DelayAlarm(this)));
   on_can_write_.reset(on_can_write);
 }
 
 WriteResult PacketDroppingTestWriter::WritePacket(
     const char* buffer,
     size_t buf_len,
     const IPAddress& self_address,
     const IPEndPoint& peer_address,
     PerPacketOptions* options) {
   ++num_calls_to_write_;
@@ skipping 152 matching lines @@
 // IPAddress has no move assignment operator.
 //
 // PacketDroppingTestWriter::DelayedWrite&
 // PacketDroppingTestWriter::DelayedWrite::operator=(
 //    PacketDroppingTestWriter::DelayedWrite&& other) = default;
 
 PacketDroppingTestWriter::DelayedWrite::~DelayedWrite() {}
 
 }  // namespace test
 }  // namespace net