Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/tools/quic/test_tools/server_thread.cc

Index: net/tools/quic/test_tools/server_thread.cc
diff --git a/net/tools/quic/test_tools/server_thread.cc b/net/tools/quic/test_tools/server_thread.cc
index 872aa4493861c44a33f978cc0f8d671d1ff6cb02..75add65f3b73fa1c8d6f57641eec5957ec118ea2 100644
--- a/net/tools/quic/test_tools/server_thread.cc
+++ b/net/tools/quic/test_tools/server_thread.cc
@@ -11,9 +11,7 @@
 namespace net {
 namespace test {
 
-ServerThread::ServerThread(QuicServer* server,
-                           const IPEndPoint& address,
-                           bool strike_register_no_startup_period)
+ServerThread::ServerThread(QuicServer* server, const IPEndPoint& address)
     : SimpleThread("server_thread"),
       confirmed_(base::WaitableEvent::ResetPolicy::MANUAL,
                  base::WaitableEvent::InitialState::NOT_SIGNALED),
@@ -28,11 +26,7 @@ ServerThread::ServerThread(QuicServer* server,
       server_(server),
       address_(address),
       port_(0),
-      initialized_(false) {
-  if (strike_register_no_startup_period) {
-    server_->SetStrikeRegisterNoStartupPeriod();
-  }
-}
+      initialized_(false) {}
 
 ServerThread::~ServerThread() {}