Move content/public/common/network_service_util.h to c/p/browser/

That's because all functions are called from browser process.

For content/renderer/workers, IsOutOfProcessNetworkService() is
used ([1]) to terminate workers if the network service crashes.
However, if the crashed network service is in the browser process,
then the workers are going to get terminated anyway, so introducing
this condition doesn't actually help. Thus we can remove them.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1264139

Bug: 1329834
Change-Id: Iaf3c9847b2231aef9e413481d6bdf53f7e9065ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4547630
Auto-Submit: Yoichi Osato <yoichio@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Owners-Override: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1150766}

chrome/browser/ash/authpolicy/kerberos_files_handler.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 
 namespace ash {

chrome/browser/ash/network_change_manager_client.cc

@@ -11,7 +11,7 @@
 #include "chromeos/ash/components/network/network_state_handler.h"
 #include "chromeos/crosapi/mojom/network_change.mojom.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "net/base/network_change_notifier_passive.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 

chrome/browser/browser_process_impl.cc

@@ -125,13 +125,13 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/network_quality_observer_factory.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/process_visibility_util.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "extensions/buildflags/buildflags.h"
 #include "extensions/common/constants.h"
 #include "media/media_buildflags.h"

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

@@ -43,11 +43,11 @@
 #include "components/sync/test/test_sync_service.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "content/public/browser/clear_site_data_utils.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/storage_usage_info.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browsing_data_remover_test_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"

chrome/browser/component_updater/pki_metadata_component_installer_browsertest.cc

@@ -23,7 +23,7 @@
 #include "components/certificate_transparency/certificate_transparency_config.pb.h"
 #include "components/certificate_transparency/ct_features.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "net/net_buildflags.h"

chrome/browser/download/notification/download_notification_browsertest.cc

@@ -51,7 +51,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/download_manager.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"

chrome/browser/extensions/corb_and_cors_extension_browsertest.cc

@@ -40,6 +40,7 @@
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/console_message.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/service_worker_context.h"
@@ -48,7 +49,6 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/resource_load_observer.h"

chrome/browser/flags/BUILD.gn

@@ -61,6 +61,7 @@ static_library("flags_android") {
     "//base",
     "//chrome/browser:browser_process",
     "//components/prefs:prefs",
+    "//content/public/browser",
     "//content/public/common",
   ]
 }

chrome/browser/flags/android/cached_feature_flags.cc

@@ -8,8 +8,8 @@
 
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;

chrome/browser/lacros/net/network_change_manager_bridge.cc

@@ -7,7 +7,7 @@
 #include "base/functional/bind.h"
 #include "chromeos/lacros/lacros_service.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "net/base/network_change_notifier_passive.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 

chrome/browser/media/webrtc/webrtc_interactive_uitest.cc

@@ -16,8 +16,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"

chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc

@@ -25,9 +25,9 @@
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/ukm/test_ukm_recorder.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/buildflags/buildflags.h"

chrome/browser/net/chrome_network_service_restart_browsertest.cc

@@ -9,8 +9,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "services/network/public/cpp/features.h"

chrome/browser/net/network_connection_tracker_browsertest.cc

@@ -16,8 +16,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "mojo/public/cpp/bindings/remote.h"

chrome/browser/net/network_context_configuration_browsertest.cc

@@ -53,10 +53,10 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/storage_partition_config.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/net/network_quality_estimator_prefs_browsertest.cc

@@ -33,8 +33,8 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_base.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/net/network_quality_tracker_browsertest.cc

@@ -20,8 +20,8 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_base.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/net/system_network_context_manager.cc

@@ -58,8 +58,8 @@
 #include "content/public/browser/child_process_termination_info.h"
 #include "content/public/browser/network_context_client_base.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/user_agent.h"
 #include "crypto/sha2.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

chrome/browser/net/system_network_context_manager_browsertest.cc

@@ -29,8 +29,8 @@
 #include "components/prefs/pref_service.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/user_agent.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/policy/policy_test_utils.cc

@@ -24,8 +24,8 @@
 #include "components/policy/policy_constants.h"
 #include "components/safe_search_api/safe_search_util.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/test_utils.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/policy/test/certificate_transparency_policy_browsertest.cc

@@ -15,8 +15,8 @@
 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "net/base/hash_value.h"

chrome/browser/policy/test/quic_allowed_browsertest.cc

@@ -23,8 +23,8 @@
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/policy_constants.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_mock_cert_verifier.h"

chrome/browser/ssl/ocsp_browsertest.cc

@@ -21,8 +21,8 @@
 #include "components/security_interstitials/content/ssl_error_handler.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/ssl_status.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "net/cert/ev_root_ca_metadata.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/ssl/sct_reporting_service_browsertest.cc

@@ -35,8 +35,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browsing_data_remover.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/browsing_data_remover_test_util.h"

chrome/browser/ssl/ssl_browsertest.cc

@@ -129,6 +129,7 @@
 #include "content/public/browser/navigation_entry_restore_context.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ -143,7 +144,6 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

chrome/browser/ui/login/login_handler_browsertest.cc

@@ -41,12 +41,12 @@
 #include "components/security_interstitials/content/ssl_blocking_page.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/prerender_test_util.h"

chrome/test/ppapi/ppapi_browsertest.cc

@@ -35,13 +35,13 @@
 #include "components/nacl/common/buildflags.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

chromecast/app/cast_test_launcher.cc

@@ -8,7 +8,7 @@
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
 #include "chromecast/app/cast_main_delegate.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/test_launcher.h"
 #include "ipc/ipc_channel.h"
 #include "mojo/core/embedder/embedder.h"

components/test/components_test_suite.cc

@@ -30,8 +30,8 @@
 #if !BUILDFLAG(USE_BLINK)
 #include "components/test/ios_components_test_initializer.h"
 #else
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/content_test_suite_base.h"
 #include "content/public/test/unittest_test_suite.h"
 #include "ui/gl/test/gl_surface_test_support.h"

content/app/content_main_runner_impl.cc

@@ -77,6 +77,7 @@
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/app/initialize_mojo_core.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/tracing_delegate.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
@@ -85,7 +86,6 @@
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/zygote/zygote_buildflags.h"
 #include "content/public/gpu/content_gpu_client.h"
 #include "content/public/renderer/content_renderer_client.h"

content/browser/browsing_data/browsing_data_browsertest_utils.cc

@@ -16,11 +16,11 @@
 #include "content/browser/browsing_data/browsing_data_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/storage_usage_info.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/url_util.h"

content/browser/browsing_data/clear_site_data_handler_browsertest.cc

@@ -28,10 +28,10 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browsing_data_remover.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/storage_usage_info.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"

content/browser/loader/loader_browsertest.cc

@@ -21,11 +21,11 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/site_isolation_policy.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

content/browser/navigation_browsertest.cc

@@ -45,6 +45,7 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/page_navigator.h"
@@ -53,7 +54,6 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/back_forward_cache_util.h"
 #include "content/public/test/browser_test.h"

content/browser/network/address_map_linux_browsertest.cc

@@ -19,8 +19,8 @@
 #include "base/task/thread_pool.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"

content/browser/network/dns_https_protocol_upgrade_browsertest.cc

@@ -6,7 +6,7 @@
 #include "base/test/bind.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"

content/browser/network/network_field_trial_browsertest.cc

@@ -7,7 +7,7 @@
 #include "base/test/mock_entropy_provider.h"
 #include "content/browser/startup_helper.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "mojo/public/cpp/bindings/remote.h"

content/browser/network/network_service_process_tracker_win.cc

@@ -8,9 +8,9 @@
 #include "base/process/process.h"
 #include "base/sequence_checker.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/service_process_host.h"
 #include "content/public/browser/service_process_info.h"
-#include "content/public/common/network_service_util.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 
 namespace content {

content/browser/network/network_service_process_tracker_win_browsertest.cc

@@ -9,8 +9,8 @@
 #include "base/process/process_handle.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "services/network/public/mojom/network_service.mojom.h"

content/browser/network/sandboxed_http_cache_browsertest.cc

@@ -17,11 +17,11 @@
 #include "content/browser/network/http_cache_backend_file_operations_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_paths.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"

content/browser/network/sandboxed_nqe_browsertest.cc

@@ -8,8 +8,8 @@
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"

content/browser/network/sandboxed_socket_broker_browsertest.cc

@@ -9,10 +9,10 @@
 #include "content/browser/network/socket_broker_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/shell/browser/shell.h"

content/browser/network/transferable_socket_browsertest.cc

@@ -12,10 +12,10 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/service_process_host.h"
 #include "content/public/browser/service_process_info.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

content/browser/network/trust_token_parameters_browsertest.cc

@@ -7,7 +7,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/test/bind.h"
 #include "base/test/scoped_feature_list.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"

content/browser/network_sandbox.cc

@@ -15,8 +15,8 @@
 #include "content/browser/network_sandbox_grant_result.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "sql/database.h"
 
 #if BUILDFLAG(IS_WIN)

content/browser/network_service_browsertest.cc

@@ -24,6 +24,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -32,7 +33,6 @@
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
@@ -1684,7 +1684,8 @@ class EmptyNetworkServiceTest : public ContentBrowserTest {
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
-IN_PROC_BROWSER_TEST_F(EmptyNetworkServiceTest, Base) {
+// TODO(https://crbug.com/1448414): Reenable this test.
+IN_PROC_BROWSER_TEST_F(EmptyNetworkServiceTest, DISABLED_Base) {
   // This test is only for high-RAM device to create another process.
   if (!IsInProcessNetworkService()) {
     GTEST_SKIP();

content/browser/network_service_client.cc

@@ -26,9 +26,9 @@
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"

content/browser/network_service_instance_impl.cc

@@ -44,10 +44,10 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/service_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"

content/browser/network_service_restart_browsertest.cc

@@ -31,10 +31,10 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/commit_message_delayer.h"

content/browser/renderer_host/navigation_request.cc

@@ -109,6 +109,7 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/origin_trials_controller_delegate.h"
 #include "content/public/browser/peak_gpu_memory_tracker.h"
 #include "content/public/browser/reduce_accept_language_controller_delegate.h"
@@ -119,7 +120,6 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/origin_util.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"

content/browser/renderer_host/render_frame_host_impl.cc

@@ -170,6 +170,7 @@
 #include "content/public/browser/document_service_internal.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/global_routing_id.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/peak_gpu_memory_tracker.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -186,7 +187,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/extra_mojo_js_features.mojom.h"
 #include "content/public/common/isolated_world_ids.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/origin_util.h"
 #include "content/public/common/page_visibility_state.h"
 #include "content/public/common/referrer.h"

content/browser/system_dns_resolution/system_dns_resolver_browsertest.cc

@@ -9,9 +9,9 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/test/test_future.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/shell/browser/shell.h"

content/browser/web_package/signed_exchange_request_handler_browsertest.cc

@@ -38,13 +38,13 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_paths.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/page_type.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"

content/browser/webrtc/webrtc_browsertest.cc

@@ -10,8 +10,8 @@
 #include "build/chromeos_buildflags.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"

content/browser/worker_host/dedicated_worker_host.cc

@@ -36,10 +36,10 @@
 #include "content/browser/worker_host/worker_script_fetcher.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/permission_controller.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "mojo/public/cpp/system/message_pipe.h"

content/public/browser/BUILD.gn

@@ -268,6 +268,8 @@ source_set("browser_sources") {
     "network_context_client_base.h",
     "network_quality_observer_factory.h",
     "network_service_instance.h",
+    "network_service_util.cc",
+    "network_service_util.h",
     "notification_database_data.cc",
     "notification_database_data.h",
     "notification_details.h",

content/public/browser/network_service_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/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"

content/public/browser/network_service_util.h

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_COMMON_NETWORK_SERVICE_UTIL_H_
-#define CONTENT_PUBLIC_COMMON_NETWORK_SERVICE_UTIL_H_
+#ifndef CONTENT_PUBLIC_BROWSER_NETWORK_SERVICE_UTIL_H_
+#define CONTENT_PUBLIC_BROWSER_NETWORK_SERVICE_UTIL_H_
 
+#include "build/build_config.h"
 #include "content/common/content_export.h"
 
 namespace content {
@@ -22,4 +23,4 @@ CONTENT_EXPORT bool IsInProcessNetworkService();
 CONTENT_EXPORT void ForceInProcessNetworkService(bool is_forced);
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_COMMON_NETWORK_SERVICE_UTIL_H_
+#endif  // CONTENT_PUBLIC_BROWSER_NETWORK_SERVICE_UTIL_H_

content/public/common/BUILD.gn

@@ -178,8 +178,6 @@ source_set("common_sources") {
     "javascript_dialog_type.h",
     "mhtml_generation_params.cc",
     "mhtml_generation_params.h",
-    "network_service_util.cc",
-    "network_service_util.h",
     "origin_util.h",
     "page_type.h",
     "page_visibility_state.h",

content/public/test/browser_test_base.cc

@@ -59,11 +59,11 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/no_renderer_crashes_assertion.h"
 #include "content/public/test/test_launcher.h"

content/public/test/content_mock_cert_verifier.cc

@@ -7,8 +7,8 @@
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/network_service_test_helper.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"

content/public/test/network_connection_change_simulator.cc

@@ -10,7 +10,7 @@
 #include "base/run_loop.h"
 #include "build/chromeos_buildflags.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/network_change_notifier.h"
 #include "services/network/public/mojom/network_service.mojom.h"

content/renderer/service_worker/service_worker_context_client.cc

@@ -25,7 +25,6 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/worker_thread.h"
@@ -152,21 +151,19 @@ ServiceWorkerContextClient::ServiceWorkerContextClient(
   blink_interface_registry_ = std::make_unique<BlinkInterfaceRegistryImpl>(
       registry_.GetWeakPtr(), /*associated_interface_registry=*/nullptr);
 
-  if (IsOutOfProcessNetworkService()) {
-    // If the network service crashes, this worker self-terminates, so it can
-    // be restarted later with a connection to the restarted network
-    // service.
-    // Note that the default factory is the network service factory. It's set
-    // on the start worker sequence.
-    network_service_disconnect_handler_holder_.Bind(
-        std::move(subresource_loaders->pending_default_factory()));
-    network_service_disconnect_handler_holder_->Clone(
-        subresource_loaders->pending_default_factory()
-            .InitWithNewPipeAndPassReceiver());
-    network_service_disconnect_handler_holder_.set_disconnect_handler(
-        base::BindOnce(&ServiceWorkerContextClient::StopWorkerOnInitiatorThread,
-                       base::Unretained(this)));
-  }
+  // If the network service crashes, this worker self-terminates, so it can
+  // be restarted later with a connection to the restarted network
+  // service.
+  // Note that the default factory is the network service factory. It's set
+  // on the start worker sequence.
+  network_service_disconnect_handler_holder_.Bind(
+      std::move(subresource_loaders->pending_default_factory()));
+  network_service_disconnect_handler_holder_->Clone(
+      subresource_loaders->pending_default_factory()
+          .InitWithNewPipeAndPassReceiver());
+  network_service_disconnect_handler_holder_.set_disconnect_handler(
+      base::BindOnce(&ServiceWorkerContextClient::StopWorkerOnInitiatorThread,
+                     base::Unretained(this)));
 
   loader_factories_ = base::MakeRefCounted<blink::ChildURLLoaderFactoryBundle>(
       std::make_unique<blink::ChildPendingURLLoaderFactoryBundle>(

content/renderer/worker/embedded_shared_worker_stub.cc

@@ -10,7 +10,6 @@
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
 #include "base/ranges/algorithm.h"
-#include "content/public/common/network_service_util.h"
 #include "content/renderer/content_security_policy_util.h"
 #include "content/renderer/policy_container_util.h"
 #include "content/renderer/worker/fetch_client_settings_object_helpers.h"
@@ -86,16 +85,14 @@ EmbeddedSharedWorkerStub::EmbeddedSharedWorkerStub(
   // If the network service crashes, then self-destruct so clients don't get
   // stuck with a worker with a broken loader. Self-destruction is effectively
   // the same as the worker's process crashing.
-  if (IsOutOfProcessNetworkService()) {
-    default_factory_disconnect_handler_holder_.Bind(std::move(
-        pending_subresource_loader_factory_bundle->pending_default_factory()));
-    default_factory_disconnect_handler_holder_->Clone(
-        pending_subresource_loader_factory_bundle->pending_default_factory()
-            .InitWithNewPipeAndPassReceiver());
-    default_factory_disconnect_handler_holder_.set_disconnect_handler(
-        base::BindOnce(&EmbeddedSharedWorkerStub::Terminate,
-                       base::Unretained(this)));
-  }
+  default_factory_disconnect_handler_holder_.Bind(std::move(
+      pending_subresource_loader_factory_bundle->pending_default_factory()));
+  default_factory_disconnect_handler_holder_->Clone(
+      pending_subresource_loader_factory_bundle->pending_default_factory()
+          .InitWithNewPipeAndPassReceiver());
+  default_factory_disconnect_handler_holder_.set_disconnect_handler(
+      base::BindOnce(&EmbeddedSharedWorkerStub::Terminate,
+                     base::Unretained(this)));
 
   // Initialize the subresource loader factory bundle passed by the browser
   // process.

content/test/content_test_suite.cc

@@ -9,9 +9,9 @@
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "content/browser/webui/content_web_ui_configs.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
-#include "content/public/common/network_service_util.h"
 #include "gpu/ipc/test_gpu_thread_holder.h"
 #include "media/base/media.h"
 #include "testing/gtest/include/gtest/gtest.h"

content/utility/services.cc

@@ -95,7 +95,6 @@ extern sandbox::TargetServices* g_utility_target_services;
         // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
 
 #if BUILDFLAG(IS_ANDROID)
-#include "content/public/common/network_service_util.h"
 #include "services/network/empty_network_service.h"
 #include "services/network/public/cpp/features.h"
 #endif
@@ -377,7 +376,9 @@ void RegisterIOThreadServices(mojo::ServiceFactory& services) {
   // loop of type IO that can get notified when pipes have data.
   services.Add(RunNetworkService);
 #if BUILDFLAG(IS_ANDROID)
-  if (IsInProcessNetworkService() &&
+  // TODO(https://crbug.com/1448414): Implement IsInProcessNetworkService.
+  const bool is_in_process_network_service = false;
+  if (is_in_process_network_service &&
       base::FeatureList::IsEnabled(
           network::features::kNetworkServiceEmptyOutOfProcess)) {
     network::RegisterEmptyNetworkService(services);

extensions/browser/extensions_test.cc

@@ -10,8 +10,8 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service_factory.h"
 #include "components/prefs/testing_pref_store.h"
+#include "content/public/browser/network_service_util.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/network_service_util.h"
 #include "content/public/test/test_browser_context.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_prefs.h"

headless/lib/browser/headless_request_context_manager.cc

@@ -26,7 +26,7 @@
 
 #if defined(HEADLESS_USE_PREFS)
 #include "components/os_crypt/sync/os_crypt.h"  // nogncheck
-#include "content/public/common/network_service_util.h"
+#include "content/public/browser/network_service_util.h"
 #endif
 
 namespace headless {