Land Recent QUIC Changes.

net/tools/quic/test_tools/server_thread.h

Index: net/tools/quic/test_tools/server_thread.h
diff --git a/net/tools/quic/test_tools/server_thread.h b/net/tools/quic/test_tools/server_thread.h
index ed36c37b3494fe94b687d469d506293a3ec5b870..520fffb4427aaf1bc9a6e68a6e7d5b1a2bc3b844 100644
--- a/net/tools/quic/test_tools/server_thread.h
+++ b/net/tools/quic/test_tools/server_thread.h
@@ -33,12 +33,10 @@ class ServerThread : public base::SimpleThread {
   // Waits for the handshake to be confirmed for the first session created.
   void WaitForCryptoHandshakeConfirmed();
 
-  // Pauses execution of the server until Resume() is called.  May only be
-  // called once.
+  // Pauses execution of the server until Resume() is called.
   void Pause();
 
-  // Resumes execution of the server after Pause() has been called.  May only
-  // be called once.
+  // Resumes execution of the server after Pause() has been called.
   void Resume();
 
   // Stops the server from executing and shuts it down, destroying all
@@ -56,12 +54,10 @@ class ServerThread : public base::SimpleThread {
  private:
   void MaybeNotifyOfHandshakeConfirmation();
 
+  base::Lock event_loop_mu_;       // Held when the server is processing events.
   base::WaitableEvent listening_;  // Notified when the server is listening.
   base::WaitableEvent confirmed_;  // Notified when the first handshake is
                                    // confirmed.
-  base::WaitableEvent pause_;      // Notified when the server should pause.
-  base::WaitableEvent paused_;     // Notitied when the server has paused
-  base::WaitableEvent resume_;     // Notified when the server should resume.
   base::WaitableEvent quit_;       // Notified when the server should quit.
 
   tools::QuicServer server_;