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

net/tools/quic/test_tools/server_thread.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/server_thread.h"
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/tools/quic/quic_dispatcher.h"
 #include "net/tools/quic/test_tools/quic_server_peer.h"
 
 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),
       pause_(base::WaitableEvent::ResetPolicy::MANUAL,
              base::WaitableEvent::InitialState::NOT_SIGNALED),
       paused_(base::WaitableEvent::ResetPolicy::MANUAL,
               base::WaitableEvent::InitialState::NOT_SIGNALED),
       resume_(base::WaitableEvent::ResetPolicy::MANUAL,
               base::WaitableEvent::InitialState::NOT_SIGNALED),
       quit_(base::WaitableEvent::ResetPolicy::MANUAL,
             base::WaitableEvent::InitialState::NOT_SIGNALED),
       server_(server),
       address_(address),
       port_(0),
-      initialized_(false) {
-  if (strike_register_no_startup_period) {
-    server_->SetStrikeRegisterNoStartupPeriod();
-  }
-}
+      initialized_(false) {}
 
 ServerThread::~ServerThread() {}
 
 void ServerThread::Initialize() {
   if (initialized_) {
     return;
   }
 
   server_->CreateUDPSocketAndListen(address_);
 
@@ skipping 81 matching lines @@
     actions.swap(scheduled_actions_);
   }
   while (!actions.empty()) {
     actions.front()();
     actions.pop_front();
   }
 }
 
 }  // namespace test
 }  // namespace net