Use EmbeddedTestServer Utility to Simplify WebSocket Test Setup

This change refactors `WebSocketBrowserTest` to leverage the updated
`InstallDefaultWebSocketHandlers` utility in `EmbeddedTestServer` with
the new `serve_websocket_test_data` parameter set to `true`. This
simplifies the setup process by automatically serving WebSocket test
data files from the `net/data/websocket` directory, removing the need
for redundant `ServeFilesFromDirectory` calls.

Bug: 40812029
Change-Id: I8234853974846fbac2842672c5deb3cca249335b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6038927
Commit-Queue: Huanpo Lin <robertlin@chromium.org>
Reviewed-by: Huanpo Lin <robertlin@chromium.org>
Auto-Submit: Ryosuke Miyake <rysk@google.com>
Reviewed-by: Adam Rice <ricea@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1387098}

chrome/browser/net/websocket_browsertest.cc

@@ -81,19 +81,11 @@ class WebSocketBrowserTest : public InProcessBrowserTest {
     // Set SSL configuration for the secure WebSocket server.
     wss_server_.SetSSLConfig(cert);
 
-    // Set up the file path for serving test files.
-    base::FilePath src_dir;
-    CHECK(base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &src_dir));
-
-    // Serve WebSocket test data directory for both HTTP and HTTPS servers.
-    const base::FilePath websocket_data =
-        src_dir.AppendASCII("net").AppendASCII("data").AppendASCII("websocket");
-    ws_server_.ServeFilesFromDirectory(websocket_data);
-    wss_server_.ServeFilesFromDirectory(websocket_data);
-
     // Install default WebSocket handlers for both HTTP and HTTPS servers.
-    net::test_server::InstallDefaultWebSocketHandlers(&ws_server_);
-    net::test_server::InstallDefaultWebSocketHandlers(&wss_server_);
+    net::test_server::InstallDefaultWebSocketHandlers(
+        &ws_server_, /*serve_websocket_test_data=*/true);
+    net::test_server::InstallDefaultWebSocketHandlers(
+        &wss_server_, /*serve_websocket_test_data=*/true);
   }
 
   WebSocketBrowserTest(const WebSocketBrowserTest&) = delete;

net/test/embedded_test_server/install_default_websocket_handlers.cc

@@ -26,7 +26,14 @@ void InstallDefaultWebSocketHandlers(EmbeddedTestServer* server,
 
   // Optionally serve WebSocket test data.
   if (serve_websocket_test_data) {
-    const base::FilePath websocket_data_dir = GetWebSocketTestDataDirectory();
+    // Set up the file path for serving test files.
+    base::FilePath src_dir;
+    CHECK(base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &src_dir));
+
+    // Serve WebSocket test data directory for both HTTP and HTTPS servers.
+    const base::FilePath websocket_data_dir =
+        src_dir.AppendASCII("net").AppendASCII("data").AppendASCII("websocket");
+
     server->ServeFilesFromDirectory(websocket_data_dir);
   }