Upstream changes making ListenSocket an abstract class.

chrome_frame/test/test_server.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 <windows.h>
 #include <objbase.h>
 #include <urlmon.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/test/test_server.h"
+#include "net/base/tcp_listen_socket.h"
 #include "net/base/winsock_init.h"
 #include "net/http/http_util.h"
 
 namespace test_server {
 const char kDefaultHeaderTemplate[] =
     "HTTP/1.1 %hs\r\n"
     "Connection: close\r\n"
     "Content-Type: %hs\r\n"
     "Content-Length: %i\r\n\r\n";
 const char kStatusOk[] = "200 OK";
@@ skipping 98 matching lines @@
                                 "Content-Type: text/html\r\n"
                                 "Location: %hs\r\n\r\n",
                                 redirect_url_.c_str());
   return true;
 }
 
 SimpleWebServer::SimpleWebServer(int port) {
   CHECK(MessageLoop::current()) << "SimpleWebServer requires a message loop";
   net::EnsureWinsockInit();
   AddResponse(&quit_);
-  server_ = net::ListenSocket::Listen("127.0.0.1", port, this);
+  server_ = net::TCPListenSocket::CreateAndListen("127.0.0.1", port, this);
   DCHECK(server_.get() != NULL);
 }
 
 SimpleWebServer::~SimpleWebServer() {
   ConnectionList::const_iterator it;
   for (it = connections_.begin(); it != connections_.end(); ++it)
     delete (*it);
   connections_.clear();
 }
 
@@ skipping 83 matching lines @@
     // extremely inefficient, but in one line and not that common... :)
     connections_.erase(std::find(connections_.begin(), connections_.end(), c));
     delete c;
   }
 }
 
 HTTPTestServer::HTTPTestServer(int port, const std::wstring& address,
                                FilePath root_dir)
     : port_(port), address_(address), root_dir_(root_dir) {
   net::EnsureWinsockInit();
-  server_ = net::ListenSocket::Listen(WideToUTF8(address), port, this);
+  server_ =
+      net::TCPListenSocket::CreateAndListen(WideToUTF8(address), port, this);
 }
 
 HTTPTestServer::~HTTPTestServer() {
   server_ = NULL;
 }
 
 std::list<scoped_refptr<ConfigurableConnection>>::iterator
 HTTPTestServer::FindConnection(const net::ListenSocket* socket) {
   ConnectionList::iterator it;
   // Scan through the list searching for the desired socket. Along the way,
@@ skipping 141 matching lines @@
     data_.append(content_length_header);
     data_.append("\r\n");
   }
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, base::Bind(&ConfigurableConnection::SendChunk, this),
       options.timeout_);
 }
 
 }  // namespace test_server