[CORS-RFC1918] Move test to chrome/browser/net.

This move was suggested by droger@ in crrev.com/c/2490012.

Bug: chromium:1124358
Change-Id: I2ab058c6e302f440bc643f0cbcd16ab848278d37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518855
Auto-Submit: Titouan Rigoudy <titouan@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Titouan Rigoudy <titouan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824396}

chrome/browser/OWNERS

@@ -89,9 +89,5 @@ per-file chrome_back_forward_cache_browsertest.cc=file://content/OWNERS
 per-file chrome_cross_origin_opener_policy_browsertest.cc=file://content/OWNERS
 per-file chrome_cross_origin_opener_policy_browsertest.cc=arthursonzogni@chromium.org
 
-# CORS-RFC1918
-per-file chrome_private_network_request_browsertest.cc=file://content/OWNERS
-per-file chrome_private_network_request_browsertest.cc=titouan@chromium.org
-
 # COMPONENT: UI>Browser
 # TEAM: chromium-reviews@chromium.org

chrome/browser/chrome_private_network_request_browsertest.cc → chrome/browser/net/private_network_request_browsertest.cc

@@ -78,7 +78,7 @@ std::map<WebFeature, int> GetAddressSpaceFeatureBucketCounts(
 //  - specification: https://wicg.github.io/cors-rfc1918.
 //  - feature browsertests in content/: RenderFrameHostImplTest.
 //
-class ChromePrivateNetworkRequestBrowserTest : public InProcessBrowserTest {
+class PrivateNetworkRequestBrowserTest : public InProcessBrowserTest {
  public:
   content::WebContents* web_contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
@@ -112,7 +112,7 @@ class ChromePrivateNetworkRequestBrowserTest : public InProcessBrowserTest {
 // a new tab to a page served by localhost.
 //
 // Regression test for https://crbug.com/1134601.
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestBrowserTest,
                        DoesNotRecordAddressSpaceFeatureForInitialNavigation) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
 // TODO(crbug.com/1129326): Revisit this once the story around top-level
 // navigations is closer to being resolved. Counting these events will help
 // decide what to do.
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestBrowserTest,
                        DoesNotRecordAddressSpaceFeatureForRegularNavigation) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -146,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
 // space loads a resource from the local network, the correct WebFeature is
 // use-counted.
 // Disabled, as explained in https://crbug.com/1143206
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestBrowserTest,
                        DISABLED_RecordsAddressSpaceFeatureForFetch) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
 // address space loads a resource from the local network, the correct WebFeature
 // is use-counted.
 IN_PROC_BROWSER_TEST_F(
-    ChromePrivateNetworkRequestBrowserTest,
+    PrivateNetworkRequestBrowserTest,
     DISABLED_RecordsAddressSpaceFeatureForFetchInNonSecureContext) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -189,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(
 // about:blank, no address space feature is recorded. It serves as a basis for
 // comparison with the following tests, which test behavior with iframes.
 IN_PROC_BROWSER_TEST_F(
-    ChromePrivateNetworkRequestBrowserTest,
+    PrivateNetworkRequestBrowserTest,
     DoesNotRecordAddressSpaceFeatureForAboutBlankNavigation) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -212,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(
 // This test verifies that when a non-secure context served from the public
 // address space loads a child frame from the local network, the correct
 // WebFeature is use-counted.
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestBrowserTest,
                        RecordsAddressSpaceFeatureForChildNavigation) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -240,7 +240,7 @@ IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
 // address space loads a grand-child frame from the local network, the correct
 // WebFeature is use-counted. If inheritance did not work correctly, the
 // intermediate about:blank frame might confuse the address space logic.
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestBrowserTest,
                        RecordsAddressSpaceFeatureForGrandchildNavigation) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
@@ -269,10 +269,10 @@ IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestBrowserTest,
           WebFeature::kAddressSpaceLocalEmbeddedInUnknownNonSecureContext, 1)));
 }
 
-class ChromePrivateNetworkRequestWithFeatureEnabledBrowserTest
-    : public ChromePrivateNetworkRequestBrowserTest {
+class PrivateNetworkRequestWithFeatureEnabledBrowserTest
+    : public PrivateNetworkRequestBrowserTest {
  public:
-  ChromePrivateNetworkRequestWithFeatureEnabledBrowserTest() {
+  PrivateNetworkRequestWithFeatureEnabledBrowserTest() {
     features_.InitAndEnableFeature(
         features::kBlockInsecurePrivateNetworkRequests);
   }
@@ -283,7 +283,7 @@ class ChromePrivateNetworkRequestWithFeatureEnabledBrowserTest
 
 // This test verifies that private network requests that are blocked do not
 // result in a WebFeature being use-counted.
-IN_PROC_BROWSER_TEST_F(ChromePrivateNetworkRequestWithFeatureEnabledBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrivateNetworkRequestWithFeatureEnabledBrowserTest,
                        DoesNotRecordAddressSpaceFeatureForBlockedRequests) {
   base::HistogramTester histogram_tester;
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();

chrome/test/BUILD.gn

@@ -988,7 +988,6 @@ if (!is_android) {
       "../browser/chrome_main_browsertest.cc",
       "../browser/chrome_navigation_browsertest.cc",
       "../browser/chrome_origin_trials_browsertest.cc",
-      "../browser/chrome_private_network_request_browsertest.cc",
       "../browser/chrome_security_exploit_browsertest.cc",
       "../browser/chrome_service_worker_browsertest.cc",
       "../browser/chrome_worker_browsertest.cc",
@@ -1146,6 +1145,7 @@ if (!is_android) {
       "../browser/net/network_quality_tracker_browsertest.cc",
       "../browser/net/network_request_metrics_browsertest.cc",
       "../browser/net/nss_context_chromeos_browsertest.cc",
+      "../browser/net/private_network_request_browsertest.cc",
       "../browser/net/profile_network_context_service_browsertest.cc",
       "../browser/net/profile_network_context_service_test_utils.cc",
       "../browser/net/profile_network_context_service_test_utils.h",