Revert "[Local Network Access] Rename c/p/t/private_network_access_ut…

…il.*." This reverts commit 503a326. Reason for revert: The spec has been renamed back to Private Network Access WICG/private-network-access#106 Original change's description: > [Local Network Access] Rename c/p/t/private_network_access_util.*. > > Bug: chromium:1418287 > Change-Id: Ie975e11476894b2e900448d2f60d2a2a5b6b3e82 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4324839 > Reviewed-by: Camille Lamy <clamy@chromium.org> > Commit-Queue: Titouan Rigoudy <titouan@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1115698} Bug: chromium:1418287 Change-Id: I386ec7df9cec8075b2533cc049e718f718b5171a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4694108 Reviewed-by: Titouan Rigoudy <titouan@chromium.org> Commit-Queue: Jonathan Hao <phao@chromium.org> Cr-Commit-Position: refs/heads/main@{#1176088}
chromium · Jul 27, 2023 · 09f7299 · 09f7299
1 parent 4d13e9f
commit 09f7299
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/chrome/browser/net/private_network_access_browsertest.cc b/chrome/browser/net/private_network_access_browsertest.cc
@@ -38,7 +38,7 @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
-#include "content/public/test/local_network_access_util.h"
+#include "content/public/test/private_network_access_util.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/url_loader_interceptor.h"
 #include "extensions/common/constants.h"

diff --git a/content/browser/renderer_host/private_network_access_browsertest.cc b/content/browser/renderer_host/private_network_access_browsertest.cc
@@ -27,7 +27,7 @@
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_content_browser_client.h"
 #include "content/public/test/content_browser_test_utils.h"
-#include "content/public/test/local_network_access_util.h"
+#include "content/public/test/private_network_access_util.h"
 #include "content/public/test/resource_load_observer.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test_utils_internal.h"

diff --git a/.../public/test/local_network_access_util.cc → ...ublic/test/private_network_access_util.cc b/.../public/test/local_network_access_util.cc → ...ublic/test/private_network_access_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/test/local_network_access_util.h"
+#include "content/public/test/private_network_access_util.h"
 
 #include "base/functional/bind.h"
 
@@ -39,7 +39,7 @@ void DeprecationTrialURLLoaderInterceptor::HandleEnabledUrlRequest(
       "Content-Type: text/html\n"  //
       // Use CSP to make the page `public`, even though it is served with no
       // IP address information. Without this it is treated as `unknown`, and
-      // that interferes with its local network request policy.
+      // that interferes with its private network request policy.
       "Content-Security-Policy: treat-as-public-address\n"  //
       // This token was generated using:
       //

diff --git a/...t/public/test/local_network_access_util.h → ...public/test/private_network_access_util.h b/...t/public/test/local_network_access_util.h → ...public/test/private_network_access_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_TEST_LOCAL_NETWORK_ACCESS_UTIL_H_
-#define CONTENT_PUBLIC_TEST_LOCAL_NETWORK_ACCESS_UTIL_H_
+#ifndef CONTENT_PUBLIC_TEST_PRIVATE_NETWORK_ACCESS_UTIL_H_
+#define CONTENT_PUBLIC_TEST_PRIVATE_NETWORK_ACCESS_UTIL_H_
 
 #include "content/public/test/url_loader_interceptor.h"
 #include "url/gurl.h"
@@ -49,4 +49,4 @@ class DeprecationTrialURLLoaderInterceptor {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_TEST_LOCAL_NETWORK_ACCESS_UTIL_H_
+#endif  // CONTENT_PUBLIC_TEST_PRIVATE_NETWORK_ACCESS_UTIL_H_
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -214,8 +214,6 @@ static_library("test_support") {
     "../public/test/keep_alive_url_loader_utils.h",
     "../public/test/local_frame_host_interceptor.cc",
     "../public/test/local_frame_host_interceptor.h",
-    "../public/test/local_network_access_util.cc",
-    "../public/test/local_network_access_util.h",
     "../public/test/media_start_stop_observer.cc",
     "../public/test/media_start_stop_observer.h",
     "../public/test/mock_browsing_data_remover_delegate.cc",
@@ -262,6 +260,8 @@ static_library("test_support") {
     "../public/test/preloading_test_util.h",
     "../public/test/prerender_test_util.cc",
     "../public/test/prerender_test_util.h",
+    "../public/test/private_network_access_util.cc",
+    "../public/test/private_network_access_util.h",
     "../public/test/render_frame_host_test_support.cc",
     "../public/test/render_frame_host_test_support.h",
     "../public/test/render_view_test.cc",