Revert 156742 - Launch pywebsocket via net::TestServer

net/test/base_test_server.h

Index: net/test/base_test_server.h
===================================================================
--- net/test/base_test_server.h	(revision 156770)
+++ net/test/base_test_server.h	(working copy)
@@ -30,8 +30,6 @@
  public:
   typedef std::pair<std::string, std::string> StringPair;
 
-  // Following types represent protocol schemes. See also
-  // http://www.iana.org/assignments/uri-schemes.html
   enum Type {
     TYPE_BASIC_AUTH_PROXY,
     TYPE_FTP,
@@ -182,11 +180,6 @@
       const std::vector<StringPair>& text_to_replace,
       std::string* replacement_path);
 
-  static bool UsingSSL(Type type) {
-    return type == BaseTestServer::TYPE_HTTPS ||
-           type == BaseTestServer::TYPE_WSS;
-  }
-
  protected:
   virtual ~BaseTestServer();
   Type type() const { return type_; }
Property changes on: net/test/base_test_server.h
___________________________________________________________________
Added: svn:mergeinfo