WebSocket test server migration on browser_tests

chrome/browser/net/proxy_browsertest.cc

Index: chrome/browser/net/proxy_browsertest.cc
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index dbfa42066a0e8108d240c8d5817d0d3c625ba1e9..8080d72120a2287a5122cff899ac85ce90c00445 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -85,11 +85,12 @@ class ProxyBrowserTest : public InProcessBrowserTest {
 // that requires basic authentication.
 IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) {
   // Launch WebSocket server.
-  content::TestWebSocketServer ws_server;
-  int port = ws_server.UseRandomPort();
-  FilePath ws_root_dir;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &ws_root_dir));
-  ASSERT_TRUE(ws_server.Start(ws_root_dir));
+  net::TestServer ws_server(net::TestServer::TYPE_WS,
+                            net::TestServer::kLocalhost,
+                            FilePath(FILE_PATH_LITERAL("net"))
+                                .Append(FILE_PATH_LITERAL("data"))
+                                .Append(FILE_PATH_LITERAL("websocket")));

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

As per the comment on the other CL, using
FILE_PATH_LITERAL("net/data/websocket") seems acceptable, based on the existing
codebase.

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

Done.

+  ASSERT_TRUE(ws_server.Start());
 
   content::WebContents* tab = chrome::GetActiveWebContents(browser());
   content::NavigationController* controller = &tab->GetController();
@@ -105,10 +106,8 @@ IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) {
 
   // Visit a page that tries to establish WebSocket connection. The title
   // of the page will be 'PASS' on success.
-  // TODO(bashi): Add TestWebSocketServer::GetURL() instead creating url here.
-  std::string url_path =
-      StringPrintf("%s%d%s", "http://localhost:", port, "/ws.html");
-  ui_test_utils::NavigateToURL(browser(), GURL(url_path));
+  ui_test_utils::NavigateToURL(browser(),
+                               ws_server.GetAlternateURL("connect_check.html"));
 
   const string16 result = watcher.WaitAndGetTitle();
   EXPECT_TRUE(EqualsASCII(result, "PASS"));