Land Recent QUIC Changes.

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/tools/quic/test_tools/quic_server_peer.h"
 
 namespace net {
 namespace tools {
 namespace test {
 
-ServerThread::ServerThread(IPEndPoint address,
-                           const QuicConfig& config,
-                           const QuicVersionVector& supported_versions,
-                           bool strike_register_no_startup_period,
-                           uint32 server_initial_flow_control_receive_window)
+ServerThread::ServerThread(QuicServer* server,
+                           IPEndPoint address,
+                           bool strike_register_no_startup_period)
     : SimpleThread("server_thread"),
       confirmed_(true, false),
       pause_(true, false),
       paused_(true, false),
       resume_(true, false),
       quit_(true, false),
-      server_(config,
-              supported_versions,
-              server_initial_flow_control_receive_window),
+      server_(server),
       address_(address),
       port_(0),
       initialized_(false) {
   if (strike_register_no_startup_period) {
-    server_.SetStrikeRegisterNoStartupPeriod();
+    server_->SetStrikeRegisterNoStartupPeriod();
   }
 }
 
 ServerThread::~ServerThread() {}
 
 void ServerThread::Initialize() {
   if (initialized_) {
     return;
   }
 
-  server_.Listen(address_);
+  server_->Listen(address_);
 
   port_lock_.Acquire();
-  port_ = server_.port();
+  port_ = server_->port();
   port_lock_.Release();
 
   initialized_ = true;
 }
 
 void ServerThread::Run() {
   if (!initialized_) {
     Initialize();
   }
 
   while (!quit_.IsSignaled()) {
     if (pause_.IsSignaled() && !resume_.IsSignaled()) {
       paused_.Signal();
       resume_.Wait();
     }
-    server_.WaitForEvents();
+    server_->WaitForEvents();
     MaybeNotifyOfHandshakeConfirmation();
   }
 
-  server_.Shutdown();
+  server_->Shutdown();
 }
 
 int ServerThread::GetPort() {
   port_lock_.Acquire();
   int rc = port_;
   port_lock_.Release();
   return rc;
 }
 
 void ServerThread::WaitForCryptoHandshakeConfirmed() {
@@ skipping 31 matching lines @@
   }
   QuicSession* session = dispatcher->session_map().begin()->second;
   if (session->IsCryptoHandshakeConfirmed()) {
     confirmed_.Signal();
   }
 }
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net