Update from https://crrev.com/311076

net/tools/quic/quic_client.cc

 // Copyright (c) 2012 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/quic_client.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ skipping 58 matching lines @@
       overflow_supported_(false),
       supported_versions_(supported_versions),
       print_response_(print_response) {
 }
 
 QuicClient::~QuicClient() {
   if (connected()) {
     session()->connection()->SendConnectionClosePacket(
         QUIC_PEER_GOING_AWAY, "");
   }
-  if (fd_ > 0) {
-    epoll_server_->UnregisterFD(fd_);
-  }
+
+  CleanUpUDPSocket();
 }
 
 bool QuicClient::Initialize() {
   DCHECK(!initialized_);
 
   // If an initial flow control window has not explicitly been set, then use the
   // same value that Chrome uses: 10 Mb.
   const uint32 kInitialFlowControlWindow = 10 * 1024 * 1024;  // 10 Mb
-  if (config_.GetInitialFlowControlWindowToSend() ==
-      kMinimumFlowControlSendWindow) {
-    config_.SetInitialFlowControlWindowToSend(kInitialFlowControlWindow);
-  }
   if (config_.GetInitialStreamFlowControlWindowToSend() ==
       kMinimumFlowControlSendWindow) {
     config_.SetInitialStreamFlowControlWindowToSend(kInitialFlowControlWindow);
   }
   if (config_.GetInitialSessionFlowControlWindowToSend() ==
       kMinimumFlowControlSendWindow) {
     config_.SetInitialSessionFlowControlWindowToSend(kInitialFlowControlWindow);
   }
 
   epoll_server_->set_timeout_in_us(50 * 1000);
@@ skipping 125 matching lines @@
   return !session_->IsEncryptionEstablished() &&
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
   DCHECK(initialized_);
 
   if (connected()) {
     session()->connection()->SendConnectionClose(QUIC_PEER_GOING_AWAY);
   }
-  epoll_server_->UnregisterFD(fd_);
-  close(fd_);
-  fd_ = -1;
+
+  CleanUpUDPSocket();
+
   initialized_ = false;
 }
 
+void QuicClient::CleanUpUDPSocket() {
+  if (fd_ > -1) {
+    epoll_server_->UnregisterFD(fd_);
+    close(fd_);
+    fd_ = -1;
+  }
+}
+
 void QuicClient::SendRequestsAndWaitForResponse(
     const base::CommandLine::StringVector& args) {
   for (size_t i = 0; i < args.size(); ++i) {
     BalsaHeaders headers;
     headers.SetRequestFirstlineFromStringPieces("GET", args[i], "HTTP/1.1");
     QuicSpdyClientStream* stream = CreateReliableClientStream();
     DCHECK(stream != nullptr);
     if (stream == nullptr) {
       LOG(ERROR) << "stream creation failed!";
       break;
@@ skipping 123 matching lines @@
   QuicEncryptedPacket packet(buf, bytes_read, false);
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net