[CodeInclusion] Improve terminology in ssl_browsertest

Removes instances of master/slave. Bug: 1169441 Change-Id: I3f937efb0c1a4f49d31514c0c5db5e8e0037d146 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643630 Commit-Queue: John Delaney <johnidel@chromium.org> Reviewed-by: Carlos IL <carlosil@chromium.org> Cr-Commit-Position: refs/heads/master@{#845931}

[CodeInclusion] Improve terminology in ssl_browsertest
Removes instances of master/slave. Bug: 1169441 Change-Id: I3f937efb0c1a4f49d31514c0c5db5e8e0037d146 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643630 Commit-Queue: John Delaney <johnidel@chromium.org> Reviewed-by: Carlos IL <carlosil@chromium.org> Cr-Commit-Position: refs/heads/master@{#845931}
1999531d · John Delaney · Chromium LUCI CQ · dc6688d3 · 1999531d · 1999531d
Commit 1999531d authored Jan 22, 2021 by John Delaney Committed by Chromium LUCI CQ Jan 22, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 13 deletions

chrome/browser/ssl/ssl_browsertest.cc chrome/browser/ssl/ssl_browsertest.cc +9 -12

chrome/test/data/ssl/wss_close_loop.html chrome/test/data/ssl/wss_close_loop.html +1 -1

No files found.
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -1850,31 +1850,28 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) {
  watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

  // Create GURLs to test pages.
-  std::string master_url_path = base::StringPrintf(
+  std::string wss_close_url_path = base::StringPrintf(
      "%s?%d",
      embedded_test_server()->GetURL("/ssl/wss_close.html").spec().c_str(),
      wss_server_expired_.host_port_pair().port());
-  GURL master_url(master_url_path);
-  std::string slave_url_path =
-      base::StringPrintf("%s?%d",
-                         embedded_test_server()
-                             ->GetURL("/ssl/wss_close_slave.html")
-                             .spec()
-                             .c_str(),
-                         wss_server_expired_.host_port_pair().port());
-  GURL slave_url(slave_url_path);
+  GURL wss_close_url(wss_close_url_path);
+  std::string wss_loop_url_path = base::StringPrintf(
+      "%s?%d",
+      embedded_test_server()->GetURL("/ssl/wss_close_loop.html").spec().c_str(),
+      wss_server_expired_.host_port_pair().port());
+  GURL wss_loop_url(wss_loop_url_path);

  // Create tabs and visit pages which keep on creating wss connections.
  WebContents* tabs[16];
  for (int i = 0; i < 16; ++i) {
-    tabs[i] = chrome::AddSelectedTabWithURL(browser(), slave_url,
+    tabs[i] = chrome::AddSelectedTabWithURL(browser(), wss_loop_url,
                                            ui::PAGE_TRANSITION_LINK);
  }
  chrome::SelectNextTab(browser());

  // Visit a page which waits for one TLS handshake failure.
  // The title will be changed to 'PASS'.
-  ui_test_utils::NavigateToURL(browser(), master_url);
+  ui_test_utils::NavigateToURL(browser(), wss_close_url);
  const base::string16 result = watcher.WaitAndGetTitle();
  EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass"));


--- a/chrome/test/data/ssl/wss_close_slave.html
+++ b/chrome/test/data/ssl/wss_close_slave.html
 <!DOCTYPE html>
 <html>
 <head>
-<title>slave tab pages which create hanging wss connection</title>
+<title>page which continuously creates hanging wss connection</title>
 <script type="text/javascript">
 var href = window.location.href;
 var hostBegin = href.indexOf('/') + 2;