0

Move ip-protection network code to services/network/ip_protection

This moves the "easy" files, with `ip_protection` in their name, into a
dedicated subdirectory. Subsequent CLs will work to disentangle the IP
protection functionality in NetworkServiceProxyDelegate from its other
uses.

The removal of references to //net/nqe/OWNERS satisfies a precommit
check. This file was deleted in
6adc9b8a3d.

Bug: 1476881
Change-Id: I7bc186a6d90754eab19905ed1bbe549c5dd47ecb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5169865
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Commit-Queue: Dustin Mitchell <djmitche@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1243282}
This commit is contained in:
Dustin J. Mitchell
2024-01-05 05:04:41 +00:00
committed by Chromium LUCI CQ
parent 0523a35c95
commit 3291faed12
21 changed files with 65 additions and 67 deletions

@ -1374,7 +1374,7 @@
},
'ip_protection': {
'filepath': 'chrome/browser/ip_protection/' \
'|services/network/ip_protection_' \
'|services/network/ip_protection/' \
'|services/network/network_service_proxy_delegate',
},
'kiosk': {

@ -1,5 +1,4 @@
team_email: "ip-protection-trio@google.com"
monorail {
component: "Internals>Network"
component: "Privacy>Fingerprinting>IPProtection"
}

@ -59,15 +59,15 @@ component("network_service") {
"http_server_properties_pref_delegate.h",
"ignore_errors_cert_verifier.cc",
"ignore_errors_cert_verifier.h",
"ip_protection_config_cache.h",
"ip_protection_config_cache_impl.cc",
"ip_protection_config_cache_impl.h",
"ip_protection_proxy_list_manager.h",
"ip_protection_proxy_list_manager_impl.cc",
"ip_protection_proxy_list_manager_impl.h",
"ip_protection_token_cache_manager.h",
"ip_protection_token_cache_manager_impl.cc",
"ip_protection_token_cache_manager_impl.h",
"ip_protection/ip_protection_config_cache.h",
"ip_protection/ip_protection_config_cache_impl.cc",
"ip_protection/ip_protection_config_cache_impl.h",
"ip_protection/ip_protection_proxy_list_manager.h",
"ip_protection/ip_protection_proxy_list_manager_impl.cc",
"ip_protection/ip_protection_proxy_list_manager_impl.h",
"ip_protection/ip_protection_token_cache_manager.h",
"ip_protection/ip_protection_token_cache_manager_impl.cc",
"ip_protection/ip_protection_token_cache_manager_impl.h",
"is_browser_initiated.h",
"keepalive_statistics_recorder.cc",
"keepalive_statistics_recorder.h",
@ -428,9 +428,9 @@ source_set("tests") {
"http_cache_data_counter_unittest.cc",
"http_cache_data_remover_unittest.cc",
"ignore_errors_cert_verifier_unittest.cc",
"ip_protection_config_cache_impl_unittest.cc",
"ip_protection_proxy_list_manager_impl_unittest.cc",
"ip_protection_token_cache_manager_impl_unittest.cc",
"ip_protection/ip_protection_config_cache_impl_unittest.cc",
"ip_protection/ip_protection_proxy_list_manager_impl_unittest.cc",
"ip_protection/ip_protection_token_cache_manager_impl_unittest.cc",
"keepalive_statistics_recorder_unittest.cc",
"masked_domain_list/network_service_proxy_allow_list_unittest.cc",
"masked_domain_list/network_service_resource_block_list_unittest.cc",

@ -32,9 +32,6 @@ per-file *_type_converter*.*=file://ipc/SECURITY_OWNERS
per-file network_sandbox_hook_linux.*=set noparent
per-file network_sandbox_hook_linux.*=file://sandbox/linux/OWNERS
per-file network_quality*=file://net/nqe/OWNERS
per-file BUILD.gn=file://net/nqe/OWNERS
per-file BUILD.gn=file://services/network/resource_scheduler/OWNERS
per-file BUILD.gn=file://services/network/sct_auditing/OWNERS
@ -51,6 +48,3 @@ per-file private_network_access*=lyf@chromium.org
# WebTransport
per-file web_transport*=file://net/OWNERS
# IP Protection
per-file ip_protection*=file://chrome/browser/ip_protection/OWNERS

@ -0,0 +1,4 @@
team_email: "ip-protection-trio@google.com"
monorail {
component: "Privacy>Fingerprinting>IPProtection"
}

@ -0,0 +1 @@
file://chrome/browser/ip_protection/OWNERS

@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_H_
#define SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_H_
#include "base/component_export.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@ -74,4 +74,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionConfigCache {
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_H_

@ -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 "services/network/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection/ip_protection_config_cache_impl.h"
#include "base/metrics/histogram_functions.h"
#include "base/task/task_traits.h"
@ -10,10 +10,10 @@
#include "base/time/time.h"
#include "net/base/proxy_server.h"
#include "net/base/proxy_string_util.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_proxy_list_manager_impl.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection_token_cache_manager_impl.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager_impl.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager_impl.h"
#include "services/network/public/mojom/network_context.mojom-shared.h"
#include "services/network/public/mojom/network_context.mojom.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 SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_IMPL_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_IMPL_H_
#include <deque>
#include <map>
@ -15,9 +15,9 @@
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/proxy_chain.h"
#include "services/network/ip_protection_config_cache.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_config_cache.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/public/mojom/network_context.mojom.h"
namespace network {
@ -77,4 +77,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionConfigCacheImpl
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_CONFIG_CACHE_IMPL_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_CONFIG_CACHE_IMPL_H_

@ -10,9 +10,9 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "services/network/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_proxy_list_manager_impl.h"
#include "services/network/ip_protection/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager_impl.h"
#include "services/network/public/mojom/network_context.mojom-shared.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.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 SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_H_
#define SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_H_
#include "base/component_export.h"
@ -31,4 +31,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionProxyListManager {
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_H_

@ -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 "services/network/ip_protection_proxy_list_manager_impl.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager_impl.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.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 SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_
#include "base/component_export.h"
#include "base/functional/callback.h"
@ -11,7 +11,7 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/public/mojom/network_context.mojom.h"
namespace network {
@ -81,4 +81,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionProxyListManagerImpl
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_PROXY_LIST_MANAGER_IMPL_H_

@ -9,8 +9,8 @@
#include "base/strings/stringprintf.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_proxy_list_manager_impl.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager_impl.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.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 SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_
#define SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_
#include "base/component_export.h"
#include "services/network/public/mojom/network_context.mojom.h"
@ -39,4 +39,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionTokenCacheManager {
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_H_

@ -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 "services/network/ip_protection_token_cache_manager_impl.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager_impl.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/strcat.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 SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_
#ifndef SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_
#define SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_
#include <deque>
@ -13,7 +13,7 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@ -128,4 +128,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) IpProtectionTokenCacheManagerImpl
} // namespace network
#endif // SERVICES_NETWORK_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_
#endif // SERVICES_NETWORK_IP_PROTECTION_IP_PROTECTION_TOKEN_CACHE_MANAGER_IMPL_H_

@ -10,9 +10,9 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "services/network/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection_token_cache_manager_impl.h"
#include "services/network/ip_protection/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager_impl.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.h"

@ -97,8 +97,8 @@
#include "services/network/http_auth_cache_copier.h"
#include "services/network/http_server_properties_pref_delegate.h"
#include "services/network/ignore_errors_cert_verifier.h"
#include "services/network/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection_token_cache_manager_impl.h"
#include "services/network/ip_protection/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager_impl.h"
#include "services/network/is_browser_initiated.h"
#include "services/network/net_log_exporter.h"
#include "services/network/network_service.h"

@ -12,7 +12,7 @@
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/proxy_delegate.h"
#include "services/network/ip_protection_config_cache.h"
#include "services/network/ip_protection/ip_protection_config_cache.h"
#include "services/network/masked_domain_list/network_service_proxy_allow_list.h"
#include "services/network/public/mojom/network_context.mojom.h"

@ -21,9 +21,9 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_test_util.h"
#include "services/network/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection_token_cache_manager.h"
#include "services/network/ip_protection/ip_protection_config_cache_impl.h"
#include "services/network/ip_protection/ip_protection_proxy_list_manager.h"
#include "services/network/ip_protection/ip_protection_token_cache_manager.h"
#include "services/network/masked_domain_list/network_service_proxy_allow_list.h"
#include "services/network/public/cpp/features.h"
#include "testing/gmock/include/gmock/gmock.h"