Rename content/test/data/htxg to content/test/data/sxg

Bug: 856530 Change-Id: I8da043903712003379603b443ad2c584ebc1c244 Reviewed-on: https://chromium-review.googlesource.com/1131022 Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org> Cr-Commit-Position: refs/heads/master@{#574024}
Denger-Network · Jul 11, 2018 · ba39085 · ba39085
1 parent 5e72208
commit ba39085
Show file tree

Hide file tree

Showing 33 changed files with 25 additions and 25 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -1608,7 +1608,7 @@
     'web_package': {
       'filepath': 'content/browser/loader/prefetch_url_loader'\
                   '|content/browser/web_package/'\
-                  '|content/test/data/htxg/'
+                  '|content/test/data/sxg/'
     },
     'web_share': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/webshare/'\

diff --git a/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc b/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc
@@ -196,7 +196,7 @@ TEST(SignedExchangeCertificateParseB1Test, ParseGoldenFile) {
   base::FilePath path;
   base::PathService::Get(content::DIR_TEST_DATA, &path);
   path =
-      path.AppendASCII("htxg").AppendASCII("test.example.org.public.pem.cbor");
+      path.AppendASCII("sxg").AppendASCII("test.example.org.public.pem.cbor");
   std::string contents;
   ASSERT_TRUE(base::ReadFileToString(path, &contents));
 

diff --git a/content/browser/web_package/signed_exchange_envelope_unittest.cc b/content/browser/web_package/signed_exchange_envelope_unittest.cc
@@ -57,13 +57,13 @@ base::Optional<SignedExchangeEnvelope> GenerateHeaderAndParse(
 }  // namespace
 
 TEST(SignedExchangeEnvelopeTest, ParseGoldenFile) {
-  base::FilePath test_htxg_path;
-  base::PathService::Get(content::DIR_TEST_DATA, &test_htxg_path);
-  test_htxg_path = test_htxg_path.AppendASCII("htxg").AppendASCII(
+  base::FilePath test_sxg_path;
+  base::PathService::Get(content::DIR_TEST_DATA, &test_sxg_path);
+  test_sxg_path = test_sxg_path.AppendASCII("sxg").AppendASCII(
       "test.example.org_test.htxg");
 
   std::string contents;
-  ASSERT_TRUE(base::ReadFileToString(test_htxg_path, &contents));
+  ASSERT_TRUE(base::ReadFileToString(test_sxg_path, &contents));
   auto* contents_bytes = reinterpret_cast<const uint8_t*>(contents.data());
 
   ASSERT_GT(contents.size(), SignedExchangePrologue::kEncodedPrologueInBytes);

diff --git a/content/browser/web_package/signed_exchange_handler_unittest.cc b/content/browser/web_package/signed_exchange_handler_unittest.cc
@@ -53,7 +53,7 @@ constexpr base::StringPiece kDummySCTList = "SCT";
 std::string GetTestFileContents(base::StringPiece name) {
   base::FilePath path;
   base::PathService::Get(content::DIR_TEST_DATA, &path);
-  path = path.AppendASCII("htxg").AppendASCII(name);
+  path = path.AppendASCII("sxg").AppendASCII(name);
 
   std::string contents;
   CHECK(base::ReadFileToString(path, &contents));
@@ -64,7 +64,7 @@ scoped_refptr<net::X509Certificate> LoadCertificate(
     const std::string& cert_file) {
   base::FilePath dir_path;
   base::PathService::Get(content::DIR_TEST_DATA, &dir_path);
-  dir_path = dir_path.AppendASCII("htxg");
+  dir_path = dir_path.AppendASCII("sxg");
 
   base::ScopedAllowBlockingForTesting allow_io;
   return net::CreateCertificateChainFromFile(

diff --git a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc
@@ -109,7 +109,7 @@ class SignedExchangeRequestHandlerBrowserTest : public ContentBrowserTest {
     base::ScopedAllowBlockingForTesting allow_io;
     base::FilePath dir_path;
     base::PathService::Get(content::DIR_TEST_DATA, &dir_path);
-    dir_path = dir_path.AppendASCII("htxg");
+    dir_path = dir_path.AppendASCII("sxg");
 
     return net::CreateCertificateChainFromFile(
         dir_path, cert_file, net::X509Certificate::FORMAT_PEM_CERT_SEQUENCE);
@@ -172,7 +172,7 @@ class SignedExchangeRequestHandlerWithNetworkServiceBrowserTest
 IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, Simple) {
   InstallUrlInterceptor(
       GURL("https://cert.example.org/cert.msg"),
-      "content/test/data/htxg/test.example.org.public.pem.cbor");
+      "content/test/data/sxg/test.example.org.public.pem.cbor");
 
   // Make the MockCertVerifier treat the certificate
   // "prime256v1-sha256.public.pem" as valid for "test.example.org".
@@ -188,15 +188,15 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, Simple) {
 
   embedded_test_server()->RegisterRequestMonitor(
       base::BindRepeating([](const net::test_server::HttpRequest& request) {
-        if (request.relative_url == "/htxg/test.example.org_test.htxg") {
+        if (request.relative_url == "/sxg/test.example.org_test.htxg") {
           const auto& accept_value = request.headers.find("accept")->second;
           EXPECT_THAT(accept_value,
                       ::testing::HasSubstr("application/signed-exchange;v=b1"));
         }
       }));
   embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg");
+  GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg");
   base::string16 title = base::ASCIIToUTF16("https://test.example.org/test/");
   TitleWatcher title_watcher(shell()->web_contents(), title);
   NavigateToURL(shell(), url);
@@ -225,7 +225,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest,
                        InvalidContentType) {
   InstallUrlInterceptor(
       GURL("https://cert.example.org/cert.msg"),
-      "content/test/data/htxg/test.example.org.public.pem.cbor");
+      "content/test/data/sxg/test.example.org.public.pem.cbor");
 
   // Make the MockCertVerifier treat the certificate
   // "prime256v1-sha256.public.pem" as valid for "test.example.org".
@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest,
   embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url = embedded_test_server()->GetURL(
-      "/htxg/test.example.org_test_invalid_content_type.htxg");
+      "/sxg/test.example.org_test_invalid_content_type.htxg");
 
   NavigationFailureObserver failure_observer(shell()->web_contents());
   NavigateToURL(shell(), url);
@@ -254,11 +254,11 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, CertNotFound) {
   InstallUrlInterceptor(GURL("https://cert.example.org/cert.msg"),
-                        "content/test/data/htxg/404.msg");
+                        "content/test/data/sxg/404.msg");
 
   embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg");
+  GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg");
 
   NavigationFailureObserver failure_observer(shell()->web_contents());
   NavigateToURL(shell(), url);
@@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(
     NetworkServiceEnabled) {
   InstallUrlInterceptor(
       GURL("https://test.example.org/cert.msg"),
-      "content/test/data/htxg/test.example.org.public.pem.cbor");
+      "content/test/data/sxg/test.example.org.public.pem.cbor");
 
   // Make the MockCertVerifier treat the certificate
   // "prime256v1-sha256.public.pem" as valid for "test.example.org".
@@ -289,7 +289,7 @@ IN_PROC_BROWSER_TEST_F(
 
   embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg");
+  GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg");
 
   NavigationFailureObserver failure_observer(shell()->web_contents());
   NavigateToURL(shell(), url);
@@ -303,22 +303,22 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest,
                        RealCertVerifier) {
   InstallUrlInterceptor(
       GURL("https://cert.example.org/cert.msg"),
-      "content/test/data/htxg/test.example.org.public.pem.cbor");
+      "content/test/data/sxg/test.example.org.public.pem.cbor");
 
   // Use "real" CertVerifier.
   SignedExchangeHandler::SetCertVerifierForTesting(nullptr);
 
   embedded_test_server()->RegisterRequestMonitor(
       base::BindRepeating([](const net::test_server::HttpRequest& request) {
-        if (request.relative_url == "/htxg/test.example.org_test.htxg") {
+        if (request.relative_url == "/sxg/test.example.org_test.htxg") {
           const auto& accept_value = request.headers.find("accept")->second;
           EXPECT_THAT(accept_value,
                       ::testing::HasSubstr("application/signed-exchange;v=b1"));
         }
       }));
   embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg");
+  GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg");
 
   // "test.example.org_test.htxg" should pass CertVerifier::Verify() and then
   // fail at SignedExchangeHandler::CheckOCSPStatus() because of the dummy OCSP

diff --git a/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc b/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc
@@ -62,7 +62,7 @@ TEST(SignedExchangeSignatureVerifier, EncodeCanonicalExchangeHeaders) {
 const uint64_t kSignatureHeaderDate = 1517892341;
 const uint64_t kSignatureHeaderExpires = 1517895941;
 
-// See content/testdata/htxg/README on how to generate this data.
+// See content/testdata/sxg/README on how to generate this data.
 // clang-format off
 constexpr char kSignatureHeaderRSA[] =
     "label; "
@@ -78,7 +78,7 @@ constexpr char kSignatureHeaderRSA[] =
     "date=1517892341; expires=1517895941";
 // clang-format on
 
-// See content/testdata/htxg/README on how to generate this data.
+// See content/testdata/sxg/README on how to generate this data.
 // clang-format off
 constexpr char kSignatureHeaderECDSAP256[] =
     "label; "
@@ -91,7 +91,7 @@ constexpr char kSignatureHeaderECDSAP256[] =
     "date=1517892341; expires=1517895941";
 // clang-format on
 
-// See content/testdata/htxg/README on how to generate this data.
+// See content/testdata/sxg/README on how to generate this data.
 // clang-format off
 constexpr char kSignatureHeaderECDSAP384[] =
     "label; "

diff --git a/content/test/data/htxg/.gitattributes → content/test/data/sxg/.gitattributes b/content/test/data/htxg/.gitattributes → content/test/data/sxg/.gitattributes
diff --git a/.../test/data/htxg/127.0.0.1.public.pem.cbor → ...t/test/data/sxg/127.0.0.1.public.pem.cbor b/.../test/data/htxg/127.0.0.1.public.pem.cbor → ...t/test/data/sxg/127.0.0.1.public.pem.cbor
diff --git a/content/test/data/htxg/404.msg → content/test/data/sxg/404.msg b/content/test/data/htxg/404.msg → content/test/data/sxg/404.msg
diff --git a/.../test/data/htxg/404.msg.mock-http-headers → ...t/test/data/sxg/404.msg.mock-http-headers b/.../test/data/htxg/404.msg.mock-http-headers → ...t/test/data/sxg/404.msg.mock-http-headers
diff --git a/content/test/data/htxg/README → content/test/data/sxg/README b/content/test/data/htxg/README → content/test/data/sxg/README
diff --git a/content/test/data/htxg/hello.txt → content/test/data/sxg/hello.txt b/content/test/data/htxg/hello.txt → content/test/data/sxg/hello.txt
diff --git a/...a/htxg/prime256v1-sha256-noext.public.pem → ...ta/sxg/prime256v1-sha256-noext.public.pem b/...a/htxg/prime256v1-sha256-noext.public.pem → ...ta/sxg/prime256v1-sha256-noext.public.pem
diff --git a/content/test/data/htxg/prime256v1-sha256.csr → content/test/data/sxg/prime256v1-sha256.csr b/content/test/data/htxg/prime256v1-sha256.csr → content/test/data/sxg/prime256v1-sha256.csr
diff --git a/...st/data/htxg/prime256v1-sha256.public.pem → ...est/data/sxg/prime256v1-sha256.public.pem b/...st/data/htxg/prime256v1-sha256.public.pem → ...est/data/sxg/prime256v1-sha256.public.pem
diff --git a/content/test/data/htxg/prime256v1.key → content/test/data/sxg/prime256v1.key b/content/test/data/htxg/prime256v1.key → content/test/data/sxg/prime256v1.key
diff --git a/content/test/data/htxg/secp384r1-sha256.csr → content/test/data/sxg/secp384r1-sha256.csr b/content/test/data/htxg/secp384r1-sha256.csr → content/test/data/sxg/secp384r1-sha256.csr
diff --git a/...est/data/htxg/secp384r1-sha256.public.pem → ...test/data/sxg/secp384r1-sha256.public.pem b/...est/data/htxg/secp384r1-sha256.public.pem → ...test/data/sxg/secp384r1-sha256.public.pem
diff --git a/content/test/data/htxg/secp384r1.key → content/test/data/sxg/secp384r1.key b/content/test/data/htxg/secp384r1.key → content/test/data/sxg/secp384r1.key
diff --git a/...a/htxg/test.example.com_invalid_test.htxg → ...ta/sxg/test.example.com_invalid_test.htxg b/...a/htxg/test.example.com_invalid_test.htxg → ...ta/sxg/test.example.com_invalid_test.htxg
diff --git a/...e.com_invalid_test.htxg.mock-http-headers → ...e.com_invalid_test.htxg.mock-http-headers b/...e.com_invalid_test.htxg.mock-http-headers → ...e.com_invalid_test.htxg.mock-http-headers
diff --git a/...xg/test.example.org-noext.public.pem.cbor → ...xg/test.example.org-noext.public.pem.cbor b/...xg/test.example.org-noext.public.pem.cbor → ...xg/test.example.org-noext.public.pem.cbor
diff --git a/...ata/htxg/test.example.org.public.pem.cbor → ...data/sxg/test.example.org.public.pem.cbor b/...ata/htxg/test.example.org.public.pem.cbor → ...data/sxg/test.example.org.public.pem.cbor
diff --git a/...ple.org.public.pem.cbor.mock-http-headers → ...ple.org.public.pem.cbor.mock-http-headers b/...ple.org.public.pem.cbor.mock-http-headers → ...ple.org.public.pem.cbor.mock-http-headers
diff --git a/...data/htxg/test.example.org_hello.txt.htxg → .../data/sxg/test.example.org_hello.txt.htxg b/...data/htxg/test.example.org_hello.txt.htxg → .../data/sxg/test.example.org_hello.txt.htxg
diff --git a/...ata/htxg/test.example.org_noext_test.htxg → ...data/sxg/test.example.org_noext_test.htxg b/...ata/htxg/test.example.org_noext_test.htxg → ...data/sxg/test.example.org_noext_test.htxg
diff --git a/...test/data/htxg/test.example.org_test.htxg → .../test/data/sxg/test.example.org_test.htxg b/...test/data/htxg/test.example.org_test.htxg → .../test/data/sxg/test.example.org_test.htxg
diff --git a/...t.example.org_test.htxg.mock-http-headers → ...t.example.org_test.htxg.mock-http-headers b/...t.example.org_test.htxg.mock-http-headers → ...t.example.org_test.htxg.mock-http-headers
diff --git a/...xample.org_test_invalid_content_type.htxg → ...xample.org_test_invalid_content_type.htxg b/...xample.org_test_invalid_content_type.htxg → ...xample.org_test_invalid_content_type.htxg
diff --git a/...valid_content_type.htxg.mock-http-headers → ...valid_content_type.htxg.mock-http-headers b/...valid_content_type.htxg.mock-http-headers → ...valid_content_type.htxg.mock-http-headers
diff --git a/content/test/data/htxg/test.html → content/test/data/sxg/test.html b/content/test/data/htxg/test.html → content/test/data/sxg/test.html
diff --git a/content/test/data/htxg/x509.ext → content/test/data/sxg/x509.ext b/content/test/data/htxg/x509.ext → content/test/data/sxg/x509.ext
diff --git a/content/test/fuzzer/BUILD.gn b/content/test/fuzzer/BUILD.gn
@@ -108,7 +108,7 @@ fuzzer_test("signed_exchange_envelope_fuzzer") {
     "//base:i18n",
     "//content/test:test_support",
   ]
-  seed_corpus = "//content/test/data/htxg/"
+  seed_corpus = "//content/test/data/sxg/"
 }
 
 fuzzer_test("signed_exchange_signature_header_field_fuzzer") {