WebSocket test server migration on browser_tests

net/test/base_test_server.h

Index: net/test/base_test_server.h
diff --git a/net/test/base_test_server.h b/net/test/base_test_server.h
index 9f1290ebf17401b04271bc4156361fc4982bc67b..fc66282a30b73b6e5464b772d0974de72e3dfc67 100644
--- a/net/test/base_test_server.h
+++ b/net/test/base_test_server.h
@@ -177,6 +177,12 @@ class BaseTestServer {
                                  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,