Adds ScopedPortExceptions to EmbeddedTestServer.

net/test/embedded_test_server/embedded_test_server.h

 // 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.
 
 #ifndef NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
 #define NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 14 matching lines @@
 #include "net/base/ip_endpoint.h"
 #include "net/cert/x509_certificate.h"
 #include "net/socket/ssl_server_socket.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_server_socket.h"
 #include "net/ssl/ssl_server_config.h"
 #include "url/gurl.h"
 
 namespace net {
 
+class ScopedPortException;
 class StreamSocket;
 class TCPServerSocket;
 
 namespace test_server {
 
 class EmbeddedTestServerConnectionListener;
 class HttpConnection;
 class HttpResponse;
 struct HttpRequest;
 
@@ skipping 125 matching lines @@
   // resolved to 127.0.0.1.
   GURL GetURL(const std::string& hostname,
               const std::string& relative_url) const;
 
   // Returns the address list needed to connect to the server.
   bool GetAddressList(AddressList* address_list) const WARN_UNUSED_RESULT;
 
   // Returns the port number used by the server.
   uint16_t port() const { return port_; }
 
+  // If set to true, the port used by the server is added to the allowed ports
+  // exception list, which will let network requests succeed even if the port
+  // happens to be on the unsafe port list.
+  void SetPortExceptionEnabled(bool enabled);
+
   void SetSSLConfig(ServerCertificate cert, const SSLServerConfig& ssl_config);
   void SetSSLConfig(ServerCertificate cert);
 
   // Returns the file name of the certificate the server is using. The test
   // certificates can be found in net/data/ssl/certificates/.
   std::string GetCertificateName() const;
 
   // Returns the certificate that the server is using.
   scoped_refptr<X509Certificate> GetCertificate() const;
 
@@ skipping 84 matching lines @@
 
   std::unique_ptr<base::Thread> io_thread_;
 
   std::unique_ptr<TCPServerSocket> listen_socket_;
   std::unique_ptr<StreamSocket> accepted_socket_;
 
   EmbeddedTestServerConnectionListener* connection_listener_;
   uint16_t port_;
   GURL base_url_;
   IPEndPoint local_endpoint_;
+  std::unique_ptr<ScopedPortException> port_exception_;
 
   std::map<StreamSocket*, std::unique_ptr<HttpConnection>> connections_;
 
   // Vector of registered and default request handlers and monitors.
   std::vector<HandleRequestCallback> request_handlers_;
   std::vector<MonitorRequestCallback> request_monitors_;
   std::vector<HandleRequestCallback> default_request_handlers_;
 
   base::ThreadChecker thread_checker_;
 
   net::SSLServerConfig ssl_config_;
   ServerCertificate cert_;
   std::unique_ptr<SSLServerContext> context_;
 
   base::WeakPtrFactory<EmbeddedTestServer> weak_factory_;
 
+

[svaldez, 2016/12/09 15:26:53]

Stray?

[rohitrao (ping after 24h), 2016/12/09 16:08:53]

Done.

   DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServer);
 };
 
 }  // namespace test_server
 
 // TODO(svaldez): Refactor EmbeddedTestServer to be in the net namespace.
 using test_server::EmbeddedTestServer;
 
 }  // namespace net
 
 #endif  // NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_