Land Recent QUIC changes.

net/tools/quic/test_tools/packet_dropping_test_writer.h

 // Copyright (c) 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.
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_
 
 #include <list>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "net/quic/quic_alarm.h"
 #include "net/quic/quic_blocked_writer_interface.h"
 #include "net/quic/quic_packet_writer.h"
 #include "net/quic/test_tools/quic_test_writer.h"
 #include "net/tools/quic/quic_epoll_clock.h"
 #include "net/tools/quic/test_tools/quic_test_client.h"
 #include "net/tools/quic/test_tools/quic_test_utils.h"
 
 namespace net {
 namespace tools {
@@ skipping 20 matching lines @@
   virtual bool IsWriteBlockedDataBuffered() const OVERRIDE;
 
   // Writes out the next packet to the contained writer and returns the time
   // for the next delayed packet to be written.
   QuicTime ReleaseNextPacket();
 
   QuicBlockedWriterInterface* blocked_writer() { return blocked_writer_; }
 
   // The percent of time a packet is simulated as being lost.
   void set_fake_packet_loss_percentage(int32 fake_packet_loss_percentage) {
+    base::AutoLock locked(config_mutex_);
     fake_packet_loss_percentage_ = fake_packet_loss_percentage;
   }
 
   // The percent of time WritePacket will block and set WriteResult's status
   // to WRITE_STATUS_BLOCKED.
   void set_fake_blocked_socket_percentage(
       int32 fake_blocked_socket_percentage) {
     DCHECK(clock_);
+    base::AutoLock locked(config_mutex_);
     fake_blocked_socket_percentage_  = fake_blocked_socket_percentage;
   }
 
   // The percent of time a packet is simulated as being reordered.
   void set_fake_reorder_percentage(int32 fake_packet_reorder_percentage) {
     DCHECK(clock_);
+    base::AutoLock locked(config_mutex_);
     DCHECK(!fake_packet_delay_.IsZero());
     fake_packet_reorder_percentage_ = fake_packet_reorder_percentage;
   }
 
   // The percent of time WritePacket will block and set WriteResult's status
   // to WRITE_STATUS_BLOCKED.
   void set_fake_packet_delay(QuicTime::Delta fake_packet_delay) {
     DCHECK(clock_);
+    base::AutoLock locked(config_mutex_);
     fake_packet_delay_  = fake_packet_delay;
   }
 
   void set_seed(uint64 seed) {
     simple_random_.set_seed(seed);
   }
 
  private:
   // A single packet which will be sent at the supplied send_time.
   class DelayedWrite {
@@ skipping 10 matching lines @@
     const IPEndPoint peer_address;
     QuicTime send_time;
   };
 
   typedef std::list<DelayedWrite> DelayedPacketList;
 
   const QuicClock* clock_;
   scoped_ptr<QuicAlarm> write_unblocked_alarm_;
   scoped_ptr<QuicAlarm> delay_alarm_;
   QuicBlockedWriterInterface* blocked_writer_;
+  SimpleRandom simple_random_;
+  DelayedPacketList delayed_packets_;
+
+  base::Lock config_mutex_;
   int32 fake_packet_loss_percentage_;
   int32 fake_blocked_socket_percentage_;
   int32 fake_packet_reorder_percentage_;
   QuicTime::Delta fake_packet_delay_;
-  SimpleRandom simple_random_;
-  DelayedPacketList delayed_packets_;
 
   DISALLOW_COPY_AND_ASSIGN(PacketDroppingTestWriter);
 };
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_