WebSocket test server migration on browser_tests

net/test/base_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_BASE_TEST_SERVER_H_
 #define NET_TEST_BASE_TEST_SERVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 159 matching lines @@
 
   GURL GetURL(const std::string& path) const;
 
   GURL GetURLWithUser(const std::string& path,
                       const std::string& user) const;
 
   GURL GetURLWithUserAndPassword(const std::string& path,
                                  const std::string& user,
                                  const std::string& password) const;
 
+  // Returns a URL which starts with not specified scheme, but http or https.
+  // GetURL() returns URL which starts with corresponding scheme as specified.
+  // TYPE_WS or TYPE_WSS serves HTTP or HTTPS simultaneously, and http:// like

[Jay Civelli, 2012/10/10 15:39:46]

Did you mean respectively instead of simultaneously?

[Takashi Toyoshima, 2012/10/11 04:53:21]

TYPE_WS serves WS and HTTP simultaneously.
TYPE_WSS serves WSS and HTTPS simultaneously.

So, how about following expression.
TYPE_WS or TYPE_WSS services WS and HTTP, or WSS and HTTPS respectively.

+  // URL is often used for providing JavaScripts that contain actual tests.

[Ryan Sleevi, 2012/10/10 17:59:57]

The comment and name of this method are very confusing.

"Alternate" URL is problematic, because it does not sufficiently highlight that
the whole notion is specific to WebSockets (which may have WS and HTTP requests
served over the same server)

I'm not sure how widespread this method is, but I wonder if it makes more sense
to have callers do

GURL::Replacements replacements;
if (type == TYPE_WS) {
  replacements.SetSchemeStr("http");
} else if (type == TYPE_WSS) {
  replacements.SetSchemeStr("https");
}
return GetURL(path).ReplaceComponents(replacements);


Either way, I think the comment should be updated.

[Takashi Toyoshima, 2012/10/11 05:53:28]

Thank you for advice.
GURL::Replacements looks useful.
Currently we have only three test where this function is needed.
Using GURL::Replacements looks enough for now.

+  GURL GetAlternateURL(const std::string& path) const;
+
   static bool GetFilePathWithReplacements(
       const std::string& original_path,
       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;
   }
 
@@ skipping 59 matching lines @@
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_BASE_TEST_SERVER_H_