WebSocket test server migration on browser_tests

chrome/browser/net/proxy_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 67 matching lines @@
 #if defined(OS_CHROMEOS)
 // We bypass manually installed proxy for localhost on chromeos.
 #define MAYBE_BasicAuthWSConnect DISABLED_BasicAuthWSConnect
 #else
 #define MAYBE_BasicAuthWSConnect BasicAuthWSConnect
 #endif
 // Test that the browser can establish a WebSocket connection via a proxy
 // 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();
   content::NotificationRegistrar registrar;
   // The proxy server will request basic authentication.
   // |observer| supplies the credential.
   LoginPromptObserver observer;
   registrar.Add(&observer, chrome::NOTIFICATION_AUTH_NEEDED,
                 content::Source<content::NavigationController>(controller));
 
   content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
 
   // 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"));
   EXPECT_TRUE(observer.auth_handled());
 }
 
 }  // namespace