Move chrome/browser/{chromeos => ash}/net/
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I4e9180167554ebe77bd5da3a52e38675303d0c8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3186454
Commit-Queue: Henrique Ferreiro <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#926152}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c8a3c492..76c6bd0 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7449,14 +7449,14 @@
"ash/login/users/fake_supervised_user_manager.h",
"ash/login/users/mock_user_manager.cc",
"ash/login/users/mock_user_manager.h",
+ "ash/net/network_portal_detector_test_utils.cc",
+ "ash/net/network_portal_detector_test_utils.h",
"ash/policy/core/device_policy_builder.cc",
"ash/policy/core/device_policy_builder.h",
"ash/policy/core/fake_device_cloud_policy_manager.cc",
"ash/policy/core/fake_device_cloud_policy_manager.h",
"ash/policy/external_data/cloud_external_data_manager_base_test_util.cc",
"ash/policy/external_data/cloud_external_data_manager_base_test_util.h",
- "chromeos/net/network_portal_detector_test_utils.cc",
- "chromeos/net/network_portal_detector_test_utils.h",
"ui/app_list/test/chrome_app_list_test_support.cc",
"ui/app_list/test/chrome_app_list_test_support.h",
"ui/app_list/test/test_app_list_controller_delegate.cc",
diff --git a/chrome/browser/ash/account_manager/account_manager_util.cc b/chrome/browser/ash/account_manager/account_manager_util.cc
index 6c188ac..9652b2a 100644
--- a/chrome/browser/ash/account_manager/account_manager_util.cc
+++ b/chrome/browser/ash/account_manager/account_manager_util.cc
@@ -8,10 +8,10 @@
#include "ash/components/account_manager/account_manager_factory.h"
#include "chrome/browser/ash/account_manager/account_manager_ui_impl.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ash/app_mode/startup_app_launcher.cc b/chrome/browser/ash/app_mode/startup_app_launcher.cc
index b6daa45..b08cf22d 100644
--- a/chrome/browser/ash/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/ash/app_mode/startup_app_launcher.cc
@@ -19,7 +19,7 @@
#include "chrome/browser/apps/app_service/browser_app_launcher.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/startup_app_launcher_update_checker.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
#include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc
index 9fdfda9..54d0e5e 100644
--- a/chrome/browser/ash/customization/customization_document.cc
+++ b/chrome/browser/ash/customization/customization_document.cc
@@ -31,9 +31,9 @@
#include "chrome/browser/ash/customization/customization_wallpaper_downloader.h"
#include "chrome/browser/ash/customization/customization_wallpaper_util.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/extensions/default_app_order.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
#include "chrome/browser/extensions/external_loader.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/customization/customization_document_unittest.cc b/chrome/browser/ash/customization/customization_document_unittest.cc
index 6a865de6..2b74d98 100644
--- a/chrome/browser/ash/customization/customization_document_unittest.cc
+++ b/chrome/browser/ash/customization/customization_document_unittest.cc
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
index fef896f..9bc7f3c5 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
@@ -12,9 +12,9 @@
#include "base/macros.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
index f816829..15f312e9 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "chrome/browser/ash/dbus/proxy_resolution_service_provider.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
index 1bb6f5fdbb..2e35f14e 100644
--- a/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
+++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc
@@ -9,7 +9,7 @@
#include "ash/constants/ash_features.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/dbus/services/service_provider_test_helper.h"
diff --git a/chrome/browser/ash/login/test/network_portal_detector_mixin.cc b/chrome/browser/ash/login/test/network_portal_detector_mixin.cc
index 4e3d8e05..3ef669a 100644
--- a/chrome/browser/ash/login/test/network_portal_detector_mixin.cc
+++ b/chrome/browser/ash/login/test/network_portal_detector_mixin.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ash/login/test/network_portal_detector_mixin.h"
#include "base/run_loop.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chromeos/dbus/shill/fake_shill_manager_client.h"
namespace ash {
diff --git a/chrome/browser/ash/login/test/network_portal_detector_mixin.h b/chrome/browser/ash/login/test/network_portal_detector_mixin.h
index b90ede8..f4438070 100644
--- a/chrome/browser/ash/login/test/network_portal_detector_mixin.h
+++ b/chrome/browser/ash/login/test/network_portal_detector_mixin.h
@@ -8,7 +8,7 @@
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chromeos/network/portal_detector/network_portal_detector.h"
// TODO(https://crbug.com/1164001): move to forward declaration.
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
namespace ash {
diff --git a/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
index baeef7c..f04c395 100644
--- a/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
+++ b/chrome/browser/ash/login/ui/captive_portal_window_browsertest.cc
@@ -23,7 +23,7 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/webui_login_view.h"
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
#include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc
index 08ac16d6..7d915a9 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -48,6 +48,7 @@
#include "chrome/browser/ash/login/ui/login_display_webui.h"
#include "chrome/browser/ash/login/ui/webui_login_view.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
@@ -61,7 +62,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ash/login/version_updater/version_updater_unittest.cc b/chrome/browser/ash/login/version_updater/version_updater_unittest.cc
index 09679c4..d1decb7 100644
--- a/chrome/browser/ash/login/version_updater/version_updater_unittest.cc
+++ b/chrome/browser/ash/login/version_updater/version_updater_unittest.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/login/version_updater/mock_version_updater_delegate.h"
#include "chrome/browser/ash/login/version_updater/update_time_estimator.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index 6b902f1f4..727ffd4 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -100,6 +100,7 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chrome/browser/ash/net/rollback_network_config/rollback_network_config_service.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
@@ -112,7 +113,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/metrics/metrics_reporting_state.h"
#include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/ash/login/wizard_controller_browsertest.cc b/chrome/browser/ash/login/wizard_controller_browsertest.cc
index 7af82bfc..c02684d 100644
--- a/chrome/browser/ash/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/ash/login/wizard_controller_browsertest.cc
@@ -58,6 +58,7 @@
#include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/webui_login_view.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chrome/browser/ash/net/rollback_network_config/fake_rollback_network_config.h"
#include "chrome/browser/ash/net/rollback_network_config/rollback_network_config_service.h"
#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
@@ -66,7 +67,6 @@
#include "chrome/browser/ash/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
diff --git a/chrome/browser/chromeos/net/OWNERS b/chrome/browser/ash/net/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/net/OWNERS
rename to chrome/browser/ash/net/OWNERS
diff --git a/chrome/browser/chromeos/net/client_cert_filter.cc b/chrome/browser/ash/net/client_cert_filter.cc
similarity index 98%
rename from chrome/browser/chromeos/net/client_cert_filter.cc
rename to chrome/browser/ash/net/client_cert_filter.cc
index a11ddb8f..0a46926 100644
--- a/chrome/browser/chromeos/net/client_cert_filter.cc
+++ b/chrome/browser/ash/net/client_cert_filter.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 "chrome/browser/chromeos/net/client_cert_filter.h"
+#include "chrome/browser/ash/net/client_cert_filter.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/client_cert_filter.h b/chrome/browser/ash/net/client_cert_filter.h
similarity index 90%
rename from chrome/browser/chromeos/net/client_cert_filter.h
rename to chrome/browser/ash/net/client_cert_filter.h
index ff70520..824f26fc 100644
--- a/chrome/browser/chromeos/net/client_cert_filter.h
+++ b/chrome/browser/ash/net/client_cert_filter.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 CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_FILTER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_FILTER_H_
+#ifndef CHROME_BROWSER_ASH_NET_CLIENT_CERT_FILTER_H_
+#define CHROME_BROWSER_ASH_NET_CLIENT_CERT_FILTER_H_
#include <memory>
#include <string>
@@ -54,4 +54,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_FILTER_H_
+#endif // CHROME_BROWSER_ASH_NET_CLIENT_CERT_FILTER_H_
diff --git a/chrome/browser/chromeos/net/client_cert_store_ash.cc b/chrome/browser/ash/net/client_cert_store_ash.cc
similarity index 96%
rename from chrome/browser/chromeos/net/client_cert_store_ash.cc
rename to chrome/browser/ash/net/client_cert_store_ash.cc
index 8859da5..2c4792b 100644
--- a/chrome/browser/chromeos/net/client_cert_store_ash.cc
+++ b/chrome/browser/ash/net/client_cert_store_ash.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 "chrome/browser/chromeos/net/client_cert_store_ash.h"
+#include "chrome/browser/ash/net/client_cert_store_ash.h"
#include <cert.h>
#include <algorithm>
@@ -17,7 +17,7 @@
#include "base/task/thread_pool.h"
#include "base/threading/scoped_blocking_call.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider.h"
-#include "chrome/browser/chromeos/net/client_cert_filter.h"
+#include "chrome/browser/ash/net/client_cert_filter.h"
#include "crypto/nss_crypto_module_delegate.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_private_key.h"
diff --git a/chrome/browser/chromeos/net/client_cert_store_ash.h b/chrome/browser/ash/net/client_cert_store_ash.h
similarity index 90%
rename from chrome/browser/chromeos/net/client_cert_store_ash.h
rename to chrome/browser/ash/net/client_cert_store_ash.h
index ced51026..9cbd4eb1 100644
--- a/chrome/browser/chromeos/net/client_cert_store_ash.h
+++ b/chrome/browser/ash/net/client_cert_store_ash.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 CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_STORE_ASH_H_
-#define CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_STORE_ASH_H_
+#ifndef CHROME_BROWSER_ASH_NET_CLIENT_CERT_STORE_ASH_H_
+#define CHROME_BROWSER_ASH_NET_CLIENT_CERT_STORE_ASH_H_
#include <memory>
#include <string>
@@ -13,7 +13,7 @@
#include "base/memory/ref_counted.h"
// TODO(https://crbug.com/1164001): forward declare when moved to ash.
#include "chrome/browser/ash/certificate_provider/certificate_provider.h"
-#include "chrome/browser/chromeos/net/client_cert_filter.h"
+#include "chrome/browser/ash/net/client_cert_filter.h"
#include "net/ssl/client_cert_store_nss.h"
namespace chromeos {
@@ -63,4 +63,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_CLIENT_CERT_STORE_ASH_H_
+#endif // CHROME_BROWSER_ASH_NET_CLIENT_CERT_STORE_ASH_H_
diff --git a/chrome/browser/chromeos/net/client_cert_store_ash_unittest.cc b/chrome/browser/ash/net/client_cert_store_ash_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/client_cert_store_ash_unittest.cc
rename to chrome/browser/ash/net/client_cert_store_ash_unittest.cc
index bcd502a1..7529390 100644
--- a/chrome/browser/chromeos/net/client_cert_store_ash_unittest.cc
+++ b/chrome/browser/ash/net/client_cert_store_ash_unittest.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 "chrome/browser/chromeos/net/client_cert_store_ash.h"
+#include "chrome/browser/ash/net/client_cert_store_ash.h"
#include <memory>
#include <string>
diff --git a/chrome/browser/chromeos/net/delay_network_call.cc b/chrome/browser/ash/net/delay_network_call.cc
similarity index 96%
rename from chrome/browser/chromeos/net/delay_network_call.cc
rename to chrome/browser/ash/net/delay_network_call.cc
index ad018a5..bdd158c 100644
--- a/chrome/browser/chromeos/net/delay_network_call.cc
+++ b/chrome/browser/ash/net/delay_network_call.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 "chrome/browser/chromeos/net/delay_network_call.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/delay_network_call.h b/chrome/browser/ash/net/delay_network_call.h
similarity index 82%
rename from chrome/browser/chromeos/net/delay_network_call.h
rename to chrome/browser/ash/net/delay_network_call.h
index 0e60bf6..373fc5b5 100644
--- a/chrome/browser/chromeos/net/delay_network_call.h
+++ b/chrome/browser/ash/net/delay_network_call.h
@@ -4,8 +4,8 @@
// This file contains utility functions to wait for network state.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_DELAY_NETWORK_CALL_H_
-#define CHROME_BROWSER_CHROMEOS_NET_DELAY_NETWORK_CALL_H_
+#ifndef CHROME_BROWSER_ASH_NET_DELAY_NETWORK_CALL_H_
+#define CHROME_BROWSER_ASH_NET_DELAY_NETWORK_CALL_H_
#include "base/callback_forward.h"
@@ -31,4 +31,4 @@
using chromeos::kDefaultNetworkRetryDelayMS;
} // namespace ash
-#endif // CHROME_BROWSER_CHROMEOS_NET_DELAY_NETWORK_CALL_H_
+#endif // CHROME_BROWSER_ASH_NET_DELAY_NETWORK_CALL_H_
diff --git a/chrome/browser/chromeos/net/device_event_log_error_browsertest.cc b/chrome/browser/ash/net/device_event_log_error_browsertest.cc
similarity index 100%
rename from chrome/browser/chromeos/net/device_event_log_error_browsertest.cc
rename to chrome/browser/ash/net/device_event_log_error_browsertest.cc
diff --git a/chrome/browser/chromeos/net/dhcp_wpad_url_client.cc b/chrome/browser/ash/net/dhcp_wpad_url_client.cc
similarity index 96%
rename from chrome/browser/chromeos/net/dhcp_wpad_url_client.cc
rename to chrome/browser/ash/net/dhcp_wpad_url_client.cc
index d83cad3..9ab82a61 100644
--- a/chrome/browser/chromeos/net/dhcp_wpad_url_client.cc
+++ b/chrome/browser/ash/net/dhcp_wpad_url_client.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 "chrome/browser/chromeos/net/dhcp_wpad_url_client.h"
+#include "chrome/browser/ash/net/dhcp_wpad_url_client.h"
#include "chromeos/network/network_handler.h"
#include "chromeos/network/network_state.h"
diff --git a/chrome/browser/chromeos/net/dhcp_wpad_url_client.h b/chrome/browser/ash/net/dhcp_wpad_url_client.h
similarity index 90%
rename from chrome/browser/chromeos/net/dhcp_wpad_url_client.h
rename to chrome/browser/ash/net/dhcp_wpad_url_client.h
index fcd2cad..db9f395 100644
--- a/chrome/browser/chromeos/net/dhcp_wpad_url_client.h
+++ b/chrome/browser/ash/net/dhcp_wpad_url_client.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 CHROME_BROWSER_CHROMEOS_NET_DHCP_WPAD_URL_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_NET_DHCP_WPAD_URL_CLIENT_H_
+#ifndef CHROME_BROWSER_ASH_NET_DHCP_WPAD_URL_CLIENT_H_
+#define CHROME_BROWSER_ASH_NET_DHCP_WPAD_URL_CLIENT_H_
#include "base/macros.h"
@@ -47,4 +47,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_DHCP_WPAD_URL_CLIENT_H_
+#endif // CHROME_BROWSER_ASH_NET_DHCP_WPAD_URL_CLIENT_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/OWNERS b/chrome/browser/ash/net/network_diagnostics/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/net/network_diagnostics/OWNERS
rename to chrome/browser/ash/net/network_diagnostics/OWNERS
diff --git a/chrome/browser/chromeos/net/network_diagnostics/README.md b/chrome/browser/ash/net/network_diagnostics/README.md
similarity index 95%
rename from chrome/browser/chromeos/net/network_diagnostics/README.md
rename to chrome/browser/ash/net/network_diagnostics/README.md
index 20f28ec..b50e41a 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/README.md
+++ b/chrome/browser/ash/net/network_diagnostics/README.md
@@ -191,9 +191,9 @@
and failed to establish a TLS connection to media hostnames.
[Network Health and Configuration]: https://docs.google.com/document/d/10DSy-jZXaRo9I9aq1UqERy76t7HkgGvInWk57pHEkzg
-[network_diagnostics.mojom]: https://source.chromium.org/chromium/chromium/src/+/main:chromeos/services/network_health/public/mojom/network_diagnostics.mojom?originalUrl=https:%2F%2Fcs.chromium.org%2F
-[NetworkHealthService]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/chromeos/net/network_health/network_health_service.h?originalUrl=https:%2F%2Fcs.chromium.org%2F
-[here]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/chromeos/net/network_diagnostics/
-[RoutineVerdict]: https://source.chromium.org/chromium/chromium/src/+/main:chromeos/services/network_health/public/mojom/network_diagnostics.mojom;l=12;drc=93304dcbcf58b0af39403af08928ea4e4ec28e6d?originalUrl=https:%2F%2Fcs.chromium.org%2F
+[network_diagnostics.mojom]: https://source.chromium.org/chromium/chromium/src/+/main:chromeos/services/network_health/public/mojom/network_diagnostics.mojom
+[NetworkHealthService]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ash/net/network_health/network_health_service.h
+[here]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ash/net/network_diagnostics/
+[RoutineVerdict]: https://source.chromium.org/chromium/chromium/src/+/main:chromeos/services/network_health/public/mojom/network_diagnostics.mojom;l=12;drc=93304dcbcf58b0af39403af08928ea4e4ec28e6d
[Design Doc]: https://docs.google.com/document/d/1d5EoPBlsomWQ4HzqejFPG4v1d2cvPSndj7nmCjNZSSc
[src/platform2/diagnostics/mojo/network_diagnostics.mojom]: http://cs/chromeos_public/src/platform2/diagnostics/cros_healthd/network_diagnostics/
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
similarity index 95%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
index b7f15b5..f2077d9 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
@@ -6,8 +6,8 @@
#include <utility>
#include "base/bind.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "components/arc/arc_service_manager.h"
#include "net/dns/public/dns_protocol.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h
similarity index 85%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h
rename to chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h
index 2a30b0b..78dd48d 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
#include <string>
#include <vector>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "components/arc/mojom/net.mojom.h"
#include "components/arc/session/arc_bridge_service.h"
@@ -61,4 +61,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_DNS_RESOLUTION_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc
index 9cc5b7a..df0e8e2 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h"
#include "components/arc/test/fake_net_instance.h"
#include "content/public/test/browser_task_environment.h"
#include "net/dns/public/dns_protocol.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc
index 6233c46..8a92051 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc
@@ -6,8 +6,8 @@
#include <utility>
#include "base/bind.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_http_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "components/arc/arc_service_manager.h"
#include "net/http/http_status_code.h"
#include "url/gurl.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.h
similarity index 85%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h
rename to chrome/browser/ash/net/network_diagnostics/arc_http_routine.h
index a4839c9..224561c 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
#include <vector>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "components/arc/mojom/net.mojom.h"
#include "components/arc/session/arc_bridge_service.h"
@@ -60,4 +60,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_HTTP_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/arc_http_routine_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_http_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_http_routine_unittest.cc
index e5984f2..9adae7a3 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_http_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_http_routine_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_http_routine.h"
#include "components/arc/test/fake_net_instance.h"
#include "content/public/test/browser_task_environment.h"
#include "net/http/http_status_code.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc
index 370149f..b3f690c 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chromeos/services/network_config/in_process_instance.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
#include "components/arc/arc_service_manager.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h
similarity index 91%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h
rename to chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h
index fc9b38b7..983b6ec 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
#include <string>
#include <vector>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "components/arc/mojom/net.mojom.h"
#include "components/arc/session/arc_bridge_service.h"
@@ -107,4 +107,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_ARC_PING_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/arc_ping_routine_unittest.cc
index bf6a67c..399ed43 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine_unittest.cc
@@ -6,7 +6,7 @@
#include <string>
#include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h"
#include "chromeos/login/login_state/login_state.h"
#include "chromeos/network/network_cert_loader.h"
#include "chromeos/network/network_configuration_handler.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.cc b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc
index 4167e8d..977d3fd 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.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 "chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h
similarity index 82%
rename from chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h
rename to chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h
index d337c6e..6f45d4ef 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -48,4 +48,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_CAPTIVE_PORTAL_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/captive_portal_routine_unittest.cc
index abf035de..36c879d 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h"
#include "chromeos/login/login_state/login_state.h"
#include "chromeos/network/managed_network_configuration_handler.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
index 77776e4..accc5a1d 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.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 "chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h"
#include <iterator>
#include <map>
@@ -13,8 +13,8 @@
#include "base/bind.h"
#include "base/rand_util.h"
#include "base/time/default_tick_clock.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "components/session_manager/core/session_manager.h"
#include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h
rename to chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h
index 1b112277..7222eaef6 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/cpp/resolve_host_client_base.h"
@@ -85,4 +85,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_LATENCY_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_latency_routine_unittest.cc
index f9306bf..935bfb5 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc
index 7589fd2..17b7fe7 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.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 "chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h"
#include <iterator>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h
similarity index 87%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h
rename to chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h
index ff73562..d05e3b2 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/cpp/resolve_host_client_base.h"
@@ -76,4 +76,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLUTION_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_resolution_routine_unittest.cc
index 4bd47ce..900e9c8 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h"
#include "base/containers/circular_deque.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.cc
index 9584ea8c..08a139e 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.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 "chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h"
#include <string>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h
similarity index 82%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h
rename to chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h
index 754587c..60a2665e 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -51,4 +51,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_DNS_RESOLVER_PRESENT_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine_unittest.cc
index fb5d97a6..5883fc0 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h"
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.cc b/chrome/browser/ash/net/network_diagnostics/fake_host_resolver.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.cc
rename to chrome/browser/ash/net/network_diagnostics/fake_host_resolver.cc
index 5d0cd20..bb7d084 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.cc
+++ b/chrome/browser/ash/net/network_diagnostics/fake_host_resolver.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 "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
#include <cstdint>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h b/chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h
similarity index 91%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h
rename to chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h
index eed4f42..0d75f34 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h
+++ b/chrome/browser/ash/net/network_diagnostics/fake_host_resolver.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
#include <memory>
#include <utility>
@@ -75,4 +75,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_HOST_RESOLVER_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_network_context.cc b/chrome/browser/ash/net/network_diagnostics/fake_network_context.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_network_context.cc
rename to chrome/browser/ash/net/network_diagnostics/fake_network_context.cc
index a86b0a1..a9984e1 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_network_context.cc
+++ b/chrome/browser/ash/net/network_diagnostics/fake_network_context.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 "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h b/chrome/browser/ash/net/network_diagnostics/fake_network_context.h
similarity index 91%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h
rename to chrome/browser/ash/net/network_diagnostics/fake_network_context.h
index 5af342c..0bbfc08 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h
+++ b/chrome/browser/ash/net/network_diagnostics/fake_network_context.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
#include <memory>
#include <utility>
#include "base/containers/circular_deque.h"
#include "base/containers/span.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_udp_socket.h"
#include "services/network/test/test_network_context.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -148,4 +148,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_NETWORK_CONTEXT_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.cc b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc
similarity index 95%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.cc
rename to chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc
index bcb61cec..7fde5ab 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.cc
+++ b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.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 "chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.h b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.h
rename to chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.h
index 579a328a..ed5576bc 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_tcp_connected_socket.h
+++ b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
@@ -57,4 +57,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_TCP_CONNECTED_SOCKET_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.cc b/chrome/browser/ash/net/network_diagnostics/fake_udp_socket.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.cc
rename to chrome/browser/ash/net/network_diagnostics/fake_udp_socket.cc
index bc8a3239..2f23986 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.cc
+++ b/chrome/browser/ash/net/network_diagnostics/fake_udp_socket.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 "chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_udp_socket.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.h b/chrome/browser/ash/net/network_diagnostics/fake_udp_socket.h
similarity index 95%
rename from chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.h
rename to chrome/browser/ash/net/network_diagnostics/fake_udp_socket.h
index 557f557a..0bee9fb 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/fake_udp_socket.h
+++ b/chrome/browser/ash/net/network_diagnostics/fake_udp_socket.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
#include "base/time/time.h"
#include "content/public/test/browser_task_environment.h"
@@ -130,4 +130,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_FAKE_UDP_SOCKET_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.cc b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc
index b4d7a0d..0325820 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.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 "chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h
rename to chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h
index 46a5a96..587a51b 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
#include <string>
#include <utility>
#include <vector>
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -81,4 +81,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_GATEWAY_CAN_BE_PINGED_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc
index 92b6c5eb..72c65b0 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h"
#include "base/strings/string_number_conversions.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.cc b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc
index 6577cf9..3de8933 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.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 "chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h"
#include <algorithm>
#include <iterator>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h
similarity index 80%
rename from chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h
rename to chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h
index 8baefb29..d854db6b 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -48,4 +48,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HAS_SECURE_WIFI_CONNECTION_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc
index 83829e7..3594b6f 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_test_helper.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/host_resolver.cc b/chrome/browser/ash/net/network_diagnostics/host_resolver.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/host_resolver.cc
rename to chrome/browser/ash/net/network_diagnostics/host_resolver.cc
index c14b4f0..3817b75 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/host_resolver.cc
+++ b/chrome/browser/ash/net/network_diagnostics/host_resolver.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 "chrome/browser/chromeos/net/network_diagnostics/host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/host_resolver.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/host_resolver.h b/chrome/browser/ash/net/network_diagnostics/host_resolver.h
similarity index 90%
rename from chrome/browser/chromeos/net/network_diagnostics/host_resolver.h
rename to chrome/browser/ash/net/network_diagnostics/host_resolver.h
index 2b79920..0f13257 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/host_resolver.h
+++ b/chrome/browser/ash/net/network_diagnostics/host_resolver.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
#include "base/callback.h"
#include "mojo/public/cpp/bindings/receiver.h"
@@ -64,4 +64,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/host_resolver_unittest.cc b/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc
similarity index 95%
rename from chrome/browser/chromeos/net/network_diagnostics/host_resolver_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc
index 1bd38f0..aaf978d 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/host_resolver_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_diagnostics/host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/host_resolver.h"
#include <memory>
#include "base/bind.h"
#include "base/run_loop.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
#include "content/public/test/browser_task_environment.h"
#include "net/base/address_list.h"
#include "net/base/host_port_pair.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc
index e0f7cc4..795c3a1 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.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 "chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h"
#include <string>
#include <utility>
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/ranges/algorithm.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/storage_partition.h"
#include "services/network/public/mojom/network_context.mojom.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h
similarity index 86%
rename from chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h
rename to chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h
index ea95f6fae..66dc497 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/tls_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
#include "net/base/host_port_pair.h"
namespace chromeos {
@@ -90,4 +90,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_FIREWALL_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc
index fc1d183..22ee1d3 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h"
#include <memory>
#include <utility>
#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/test/browser_task_environment.h"
#include "net/base/net_errors.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager.cc b/chrome/browser/ash/net/network_diagnostics/http_request_manager.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/http_request_manager.cc
rename to chrome/browser/ash/net/network_diagnostics/http_request_manager.cc
index ffbd3907..635c674 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager.cc
+++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager.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 "chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_request_manager.h"
#include <memory>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h b/chrome/browser/ash/net/network_diagnostics/http_request_manager.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h
rename to chrome/browser/ash/net/network_diagnostics/http_request_manager.h
index 10fb207..a3f8afa 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h
+++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
#include <memory>
@@ -59,4 +59,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTP_REQUEST_MANAGER_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager_unittest.cc b/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/http_request_manager_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc
index 928987b..dafed1a 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/http_request_manager_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_request_manager.h"
#include <memory>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.cc b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc
index 9305e5f..3272fa44d 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.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 "chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h"
#include <string>
#include <utility>
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/ranges/algorithm.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/storage_partition.h"
#include "services/network/public/mojom/network_context.mojom.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h
similarity index 87%
rename from chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h
rename to chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h
index b02f0c6..f565e2e 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/tls_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
#include "net/base/host_port_pair.h"
namespace network {
@@ -95,4 +95,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_FIREWALL_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc
index 67e6176..9b708aa 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h"
#include <memory>
#include <utility>
#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/test/browser_task_environment.h"
#include "net/base/net_errors.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc
index 4e5442c..ecfa835 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.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 "chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_latency_routine.h"
#include <string>
#include <utility>
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/time/default_tick_clock.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/storage_partition.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h
rename to chrome/browser/ash/net/network_diagnostics/https_latency_routine.h
index 2f03e4c..0a4d57c 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
#include <memory>
#include <vector>
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/http_request_manager.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_request_manager.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "net/base/address_list.h"
#include "net/dns/public/resolve_error_info.h"
#include "services/network/public/cpp/resolve_host_client_base.h"
@@ -110,4 +110,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HTTPS_LATENCY_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/https_latency_routine_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/network_diagnostics/https_latency_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/https_latency_routine_unittest.cc
index 01f8c18..53309544 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/https_latency_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/https_latency_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_latency_routine.h"
#include <memory>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.cc b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc
index 457c7f34..e940ab8 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.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 "chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h
similarity index 81%
rename from chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h
rename to chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h
index f12b557..8a99b8a 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -47,4 +47,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_LAN_CONNECTIVITY_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine_unittest.cc
index e2ef8df..663d61f5 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h"
#include "base/memory/weak_ptr.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_test_helper.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc
similarity index 80%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc
index 3ee05a87..6633d5a 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
#include <memory>
#include <utility>
#include "base/bind.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_http_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/arc_ping_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/captive_portal_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/dns_resolver_present_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/gateway_can_be_pinged_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/has_secure_wifi_connection_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/http_firewall_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/https_firewall_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/https_latency_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/lan_connectivity_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_http_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/https_latency_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h"
#include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
#include "components/device_event_log/device_event_log.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.h
similarity index 90%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics.h
index 9dbb0d1..99587c6 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
#include <string>
#include "base/containers/flat_map.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
@@ -72,4 +72,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.cc
similarity index 90%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.cc
index d463a7b..255fcb3f 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.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 "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "base/time/time.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h
similarity index 86%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h
index f67b1c4e..f6d4ba55 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
#include "base/bind.h"
#include "base/callback.h"
@@ -58,4 +58,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine_unittest.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine_unittest.cc
index f62d303..7114a4f 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_unittest.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_unittest.cc
index fd8146a..247b08b1 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
#include <memory>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc
index 118d6bb..fa9a311 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_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 "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h
similarity index 94%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h
index 2123d07..ffd899f57 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
#include <array>
#include <cstdint>
@@ -116,4 +116,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_UTIL_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util_unittest.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util_unittest.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/network_diagnostics_util_unittest.cc
index 1c57e32..8b660119 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include <string>
#include <vector>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.cc b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc
index 7cdb05b..196d226 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.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 "chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h"
#include <algorithm>
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h
similarity index 81%
rename from chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h
rename to chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h
index f6ab1de..f1129698 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
#include <vector>
#include "base/callback.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -46,4 +46,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_SIGNAL_STRENGTH_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/signal_strength_routine_unittest.cc
index f8f83e52..067a2cae 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/signal_strength_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_test_helper.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/tls_prober.cc b/chrome/browser/ash/net/network_diagnostics/tls_prober.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/tls_prober.cc
rename to chrome/browser/ash/net/network_diagnostics/tls_prober.cc
index 87b2ccc..29c5d5ac 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/tls_prober.cc
+++ b/chrome/browser/ash/net/network_diagnostics/tls_prober.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 "chrome/browser/chromeos/net/network_diagnostics/tls_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
#include <utility>
@@ -10,7 +10,7 @@
#include "base/callback_helpers.h"
#include "base/task_runner.h"
#include "base/threading/sequenced_task_runner_handle.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/tls_prober.h b/chrome/browser/ash/net/network_diagnostics/tls_prober.h
similarity index 94%
rename from chrome/browser/chromeos/net/network_diagnostics/tls_prober.h
rename to chrome/browser/ash/net/network_diagnostics/tls_prober.h
index 64cff02..c8428c64 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/tls_prober.h
+++ b/chrome/browser/ash/net/network_diagnostics/tls_prober.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
#include "base/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/host_resolver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/completion_once_callback.h"
#include "net/base/host_port_pair.h"
@@ -119,4 +119,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/tls_prober_unittest.cc b/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/tls_prober_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc
index 2d90f38b..cdd39fa 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/tls_prober_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/tls_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
#include <memory>
#include <utility>
@@ -11,8 +11,8 @@
#include "base/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
#include "content/public/browser/network_service_instance.h"
#include "content/public/test/browser_task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/udp_prober.cc b/chrome/browser/ash/net/network_diagnostics/udp_prober.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/udp_prober.cc
rename to chrome/browser/ash/net/network_diagnostics/udp_prober.cc
index 9603ee2..420c7f6 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/udp_prober.cc
+++ b/chrome/browser/ash/net/network_diagnostics/udp_prober.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 "chrome/browser/chromeos/net/network_diagnostics/udp_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/udp_prober.h"
#include <cstdint>
#include <memory>
@@ -14,8 +14,8 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/udp_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/udp_prober.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/udp_prober.h b/chrome/browser/ash/net/network_diagnostics/udp_prober.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_diagnostics/udp_prober.h
rename to chrome/browser/ash/net/network_diagnostics/udp_prober.h
index 38d845b..82d9d32e 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/udp_prober.h
+++ b/chrome/browser/ash/net/network_diagnostics/udp_prober.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
#include <cstdint>
#include <memory>
@@ -58,4 +58,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_UDP_PROBER_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/udp_prober_unittest.cc b/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_diagnostics/udp_prober_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc
index 33d8f05..ffb851f0 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/udp_prober_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/udp_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/udp_prober.h"
#include <cstdint>
#include <memory>
@@ -15,9 +15,9 @@
#include "base/test/bind.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
+#include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "content/public/test/browser_task_environment.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc
rename to chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc
index 3a266021..7d31bc6b 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc
+++ b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h"
#include <string>
#include <utility>
#include "base/logging.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/udp_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/udp_prober.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/storage_partition.h"
#include "net/base/net_errors.h"
diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h
similarity index 90%
rename from chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h
rename to chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h
index 81e3182..f3767a3 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h
+++ b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
#include <memory>
#include <string>
@@ -13,9 +13,9 @@
#include "base/containers/span.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_routine.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/tls_prober.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/udp_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
+#include "chrome/browser/ash/net/network_diagnostics/udp_prober.h"
#include "net/base/net_errors.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "url/gurl.h"
@@ -142,4 +142,4 @@
} // namespace network_diagnostics
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_VIDEO_CONFERENCING_ROUTINE_H_
diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine_unittest.cc
rename to chrome/browser/ash/net/network_diagnostics/video_conferencing_routine_unittest.cc
index 1e6196e..1c73fc6 100644
--- a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine_unittest.cc
+++ b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine_unittest.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 "chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.h"
+#include "chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h"
#include <deque>
#include <memory>
@@ -11,7 +11,7 @@
#include "base/run_loop.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
diff --git a/chrome/browser/chromeos/net/network_health/OWNERS b/chrome/browser/ash/net/network_health/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/net/network_health/OWNERS
rename to chrome/browser/ash/net/network_health/OWNERS
diff --git a/chrome/browser/chromeos/net/network_health/README.md b/chrome/browser/ash/net/network_health/README.md
similarity index 94%
rename from chrome/browser/chromeos/net/network_health/README.md
rename to chrome/browser/ash/net/network_health/README.md
index 9670013..da9885ad 100644
--- a/chrome/browser/chromeos/net/network_health/README.md
+++ b/chrome/browser/ash/net/network_health/README.md
@@ -46,10 +46,10 @@
[Design Doc]: https://docs.google.com/document/d/18ehcBF2iC1rZDo9AV79-qJ5KUfSGIUeqX0bLDRD3XHI/edit?usp=sharing&resourcekey=0-1mYPArwll_OTBaKgQ1qeDw
[Network Health and Configuration]: https://docs.google.com/document/d/10DSy-jZXaRo9I9aq1UqERy76t7HkgGvInWk57pHEkzg
-[Network Diagnostic Routines]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/chromeos/net/network_diagnostics/README.md
+[Network Diagnostic Routines]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ash/net/network_diagnostics/README.md
[Network Health telemetry]: https://source.chromium.org/chromium/chromium/src/+/main:chromeos/services/network_health/public/mojom/network_health.mojom
[network_health.mojom]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform2/diagnostics/mojo/network_health.mojom
-[NetworkHealthService]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/chromeos/net/network_health/network_health_service.h
+[NetworkHealthService]: https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ash/net/network_health/network_health_service.h
[cros_healthd]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform2/diagnostics/cros_healthd/
[adding]: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2627331/8/diagnostics/mojo/cros_healthd.mojom#465
diff --git a/chrome/browser/chromeos/net/network_health/network_health.cc b/chrome/browser/ash/net/network_health/network_health.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_health/network_health.cc
rename to chrome/browser/ash/net/network_health/network_health.cc
index 6d21941..b816b6b1 100644
--- a/chrome/browser/chromeos/net/network_health/network_health.cc
+++ b/chrome/browser/ash/net/network_health/network_health.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 "chrome/browser/chromeos/net/network_health/network_health.h"
+#include "chrome/browser/ash/net/network_health/network_health.h"
#include <cstdint>
#include <cstdlib>
@@ -11,7 +11,7 @@
#include <vector>
#include "base/time/time.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_constants.h"
+#include "chrome/browser/ash/net/network_health/network_health_constants.h"
#include "chromeos/network/network_event_log.h"
#include "chromeos/services/network_config/in_process_instance.h"
#include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
diff --git a/chrome/browser/chromeos/net/network_health/network_health.h b/chrome/browser/ash/net/network_health/network_health.h
similarity index 94%
rename from chrome/browser/chromeos/net/network_health/network_health.h
rename to chrome/browser/ash/net/network_health/network_health.h
index 4455f50..d79857d 100644
--- a/chrome/browser/chromeos/net/network_health/network_health.h
+++ b/chrome/browser/ash/net/network_health/network_health.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
#include <memory>
#include <string>
#include <vector>
#include "base/timer/timer.h"
-#include "chrome/browser/chromeos/net/network_health/signal_strength_tracker.h"
+#include "chrome/browser/ash/net/network_health/signal_strength_tracker.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
#include "chromeos/services/network_health/public/mojom/network_health.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -143,4 +143,4 @@
} // namespace network_health
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_H_
diff --git a/chrome/browser/chromeos/net/network_health/network_health_constants.h b/chrome/browser/ash/net/network_health/network_health_constants.h
similarity index 74%
rename from chrome/browser/chromeos/net/network_health/network_health_constants.h
rename to chrome/browser/ash/net/network_health/network_health_constants.h
index f9d9b363..b72f47f44 100644
--- a/chrome/browser/chromeos/net/network_health/network_health_constants.h
+++ b/chrome/browser/ash/net/network_health/network_health_constants.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
#include "base/time/time.h"
@@ -22,4 +22,4 @@
} // namespace network_health
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_CONSTANTS_H_
diff --git a/chrome/browser/chromeos/net/network_health/network_health_service.cc b/chrome/browser/ash/net/network_health/network_health_service.cc
similarity index 88%
rename from chrome/browser/chromeos/net/network_health/network_health_service.cc
rename to chrome/browser/ash/net/network_health/network_health_service.cc
index b2b65f9..7194d7a 100644
--- a/chrome/browser/chromeos/net/network_health/network_health_service.cc
+++ b/chrome/browser/ash/net/network_health/network_health_service.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/net/network_health/network_health_service.h"
+#include "chrome/browser/ash/net/network_health/network_health_service.h"
#include "base/no_destructor.h"
-#include "chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.h"
-#include "chrome/browser/chromeos/net/network_health/network_health.h"
+#include "chrome/browser/ash/net/network_diagnostics/network_diagnostics.h"
+#include "chrome/browser/ash/net/network_health/network_health.h"
#include "chromeos/dbus/dbus_thread_manager.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/net/network_health/network_health_service.h b/chrome/browser/ash/net/network_health/network_health_service.h
similarity index 85%
rename from chrome/browser/chromeos/net/network_health/network_health_service.h
rename to chrome/browser/ash/net/network_health/network_health_service.h
index eb718068..df4af73 100644
--- a/chrome/browser/chromeos/net/network_health/network_health_service.h
+++ b/chrome/browser/ash/net/network_health/network_health_service.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
#include "chromeos/services/network_health/public/mojom/network_health.mojom.h"
@@ -47,4 +47,4 @@
} // namespace network_health
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_NETWORK_HEALTH_SERVICE_H_
diff --git a/chrome/browser/chromeos/net/network_health/network_health_unittest.cc b/chrome/browser/ash/net/network_health/network_health_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/network_health/network_health_unittest.cc
rename to chrome/browser/ash/net/network_health/network_health_unittest.cc
index 6a1733f..4b2cbac 100644
--- a/chrome/browser/chromeos/net/network_health/network_health_unittest.cc
+++ b/chrome/browser/ash/net/network_health/network_health_unittest.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 "chrome/browser/chromeos/net/network_health/network_health.h"
+#include "chrome/browser/ash/net/network_health/network_health.h"
#include <utility>
diff --git a/chrome/browser/chromeos/net/network_health/signal_strength_tracker.cc b/chrome/browser/ash/net/network_health/signal_strength_tracker.cc
similarity index 93%
rename from chrome/browser/chromeos/net/network_health/signal_strength_tracker.cc
rename to chrome/browser/ash/net/network_health/signal_strength_tracker.cc
index 1584894..607e07ed 100644
--- a/chrome/browser/chromeos/net/network_health/signal_strength_tracker.cc
+++ b/chrome/browser/ash/net/network_health/signal_strength_tracker.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/net/network_health/signal_strength_tracker.h"
+
#include <cmath>
#include <cstdint>
#include <vector>
#include "base/logging.h"
-#include "chrome/browser/chromeos/net/network_health/signal_strength_tracker.h"
namespace chromeos {
namespace network_health {
diff --git a/chrome/browser/chromeos/net/network_health/signal_strength_tracker.h b/chrome/browser/ash/net/network_health/signal_strength_tracker.h
similarity index 82%
rename from chrome/browser/chromeos/net/network_health/signal_strength_tracker.h
rename to chrome/browser/ash/net/network_health/signal_strength_tracker.h
index 0cc7c26..d22b6918 100644
--- a/chrome/browser/chromeos/net/network_health/signal_strength_tracker.h
+++ b/chrome/browser/ash/net/network_health/signal_strength_tracker.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
#include <cstdint>
#include <vector>
#include "base/containers/circular_deque.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_constants.h"
+#include "chrome/browser/ash/net/network_health/network_health_constants.h"
namespace chromeos {
namespace network_health {
@@ -51,4 +51,4 @@
} // namespace network_health
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_HEALTH_SIGNAL_STRENGTH_TRACKER_H_
diff --git a/chrome/browser/chromeos/net/network_health/signal_strength_tracker_unittest.cc b/chrome/browser/ash/net/network_health/signal_strength_tracker_unittest.cc
similarity index 95%
rename from chrome/browser/chromeos/net/network_health/signal_strength_tracker_unittest.cc
rename to chrome/browser/ash/net/network_health/signal_strength_tracker_unittest.cc
index 9c4f9ac..4c4d12f 100644
--- a/chrome/browser/chromeos/net/network_health/signal_strength_tracker_unittest.cc
+++ b/chrome/browser/ash/net/network_health/signal_strength_tracker_unittest.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 "chrome/browser/chromeos/net/network_health/signal_strength_tracker.h"
+#include "chrome/browser/ash/net/network_health/signal_strength_tracker.h"
#include <array>
#include <memory>
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/ash/net/network_portal_detector_impl.cc
similarity index 99%
rename from chrome/browser/chromeos/net/network_portal_detector_impl.cc
rename to chrome/browser/ash/net/network_portal_detector_impl.cc
index edd0438..6d0ea6f 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/ash/net/network_portal_detector_impl.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 "chrome/browser/chromeos/net/network_portal_detector_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_impl.h"
#include <algorithm>
#include <memory>
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/ash/net/network_portal_detector_impl.h
similarity index 97%
rename from chrome/browser/chromeos/net/network_portal_detector_impl.h
rename to chrome/browser/ash/net/network_portal_detector_impl.h
index df340bb..5084bc2 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.h
+++ b/chrome/browser/ash/net/network_portal_detector_impl.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
#include <map>
#include <memory>
@@ -236,4 +236,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
rename to chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc
index f054ce54..43c9cab9 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/net/network_portal_detector_impl.h"
+
#include <memory>
#include "base/bind.h"
@@ -15,9 +17,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ash/login/login_manager_test.h"
#include "chrome/browser/ash/login/startup_utils.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_utils.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
#include "chrome/browser/notifications/notification_display_service_tester.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/ash/net/network_portal_detector_impl_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
rename to chrome/browser/ash/net/network_portal_detector_impl_unittest.cc
index 0236775..2387f8e 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/ash/net/network_portal_detector_impl_unittest.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 "chrome/browser/chromeos/net/network_portal_detector_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_impl.h"
#include <algorithm>
#include <memory>
@@ -20,7 +20,7 @@
#include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h"
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_utils.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc b/chrome/browser/ash/net/network_portal_detector_test_impl.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_portal_detector_test_impl.cc
rename to chrome/browser/ash/net/network_portal_detector_test_impl.cc
index 82ede098..6fc9812 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc
+++ b/chrome/browser/ash/net/network_portal_detector_test_impl.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 "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include <memory>
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h b/chrome/browser/ash/net/network_portal_detector_test_impl.h
similarity index 92%
rename from chrome/browser/chromeos/net/network_portal_detector_test_impl.h
rename to chrome/browser/ash/net/network_portal_detector_test_impl.h
index 479f575..1754513 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
+++ b/chrome/browser/ash/net/network_portal_detector_test_impl.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
#include <map>
#include <memory>
@@ -80,4 +80,4 @@
using ::chromeos::NetworkPortalDetectorTestImpl;
} // namespace ash
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_IMPL_H_
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc b/chrome/browser/ash/net/network_portal_detector_test_utils.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_portal_detector_test_utils.cc
rename to chrome/browser/ash/net/network_portal_detector_test_utils.cc
index 38cf864..d04944f 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc
+++ b/chrome/browser/ash/net/network_portal_detector_test_utils.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 "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_utils.h"
#include <stddef.h>
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_utils.h b/chrome/browser/ash/net/network_portal_detector_test_utils.h
similarity index 83%
rename from chrome/browser/chromeos/net/network_portal_detector_test_utils.h
rename to chrome/browser/ash/net/network_portal_detector_test_utils.h
index 319d8d96..c810418 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_utils.h
+++ b/chrome/browser/ash/net/network_portal_detector_test_utils.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
#include <string>
#include <vector>
@@ -48,4 +48,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_DETECTOR_TEST_UTILS_H_
diff --git a/chrome/browser/chromeos/net/network_portal_web_dialog.cc b/chrome/browser/ash/net/network_portal_web_dialog.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_portal_web_dialog.cc
rename to chrome/browser/ash/net/network_portal_web_dialog.cc
index d7fbab1..2d6e124 100644
--- a/chrome/browser/chromeos/net/network_portal_web_dialog.cc
+++ b/chrome/browser/ash/net/network_portal_web_dialog.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 "chrome/browser/chromeos/net/network_portal_web_dialog.h"
+#include "chrome/browser/ash/net/network_portal_web_dialog.h"
#include "components/captive_portal/core/captive_portal_detector.h"
#include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/chromeos/net/network_portal_web_dialog.h b/chrome/browser/ash/net/network_portal_web_dialog.h
similarity index 89%
rename from chrome/browser/chromeos/net/network_portal_web_dialog.h
rename to chrome/browser/ash/net/network_portal_web_dialog.h
index 7d779c5..d5ceb0c 100644
--- a/chrome/browser/chromeos/net/network_portal_web_dialog.h
+++ b/chrome/browser/ash/net/network_portal_web_dialog.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_WEB_DIALOG_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_WEB_DIALOG_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_WEB_DIALOG_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_WEB_DIALOG_H_
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -52,4 +52,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_WEB_DIALOG_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_PORTAL_WEB_DIALOG_H_
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer.cc b/chrome/browser/ash/net/network_pref_state_observer.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_pref_state_observer.cc
rename to chrome/browser/ash/net/network_pref_state_observer.cc
index e0566c2..967c6155 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer.cc
+++ b/chrome/browser/ash/net/network_pref_state_observer.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 "chrome/browser/chromeos/net/network_pref_state_observer.h"
+#include "chrome/browser/ash/net/network_pref_state_observer.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer.h b/chrome/browser/ash/net/network_pref_state_observer.h
similarity index 85%
rename from chrome/browser/chromeos/net/network_pref_state_observer.h
rename to chrome/browser/ash/net/network_pref_state_observer.h
index 1ebaa9b..a27b1dd 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer.h
+++ b/chrome/browser/ash/net/network_pref_state_observer.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_PREF_STATE_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PREF_STATE_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_PREF_STATE_OBSERVER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_PREF_STATE_OBSERVER_H_
#include "base/macros.h"
#include "base/scoped_observation.h"
@@ -40,4 +40,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PREF_STATE_OBSERVER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_PREF_STATE_OBSERVER_H_
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc b/chrome/browser/ash/net/network_pref_state_observer_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
rename to chrome/browser/ash/net/network_pref_state_observer_unittest.cc
index da0e87d..b370481 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
+++ b/chrome/browser/ash/net/network_pref_state_observer_unittest.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 "chrome/browser/chromeos/net/network_pref_state_observer.h"
+#include "chrome/browser/ash/net/network_pref_state_observer.h"
#include <memory>
diff --git a/chrome/browser/chromeos/net/network_throttling_observer.cc b/chrome/browser/ash/net/network_throttling_observer.cc
similarity index 96%
rename from chrome/browser/chromeos/net/network_throttling_observer.cc
rename to chrome/browser/ash/net/network_throttling_observer.cc
index f46dfed..cc45930 100644
--- a/chrome/browser/chromeos/net/network_throttling_observer.cc
+++ b/chrome/browser/ash/net/network_throttling_observer.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 "chrome/browser/chromeos/net/network_throttling_observer.h"
+#include "chrome/browser/ash/net/network_throttling_observer.h"
#include <memory>
#include <string>
diff --git a/chrome/browser/chromeos/net/network_throttling_observer.h b/chrome/browser/ash/net/network_throttling_observer.h
similarity index 85%
rename from chrome/browser/chromeos/net/network_throttling_observer.h
rename to chrome/browser/ash/net/network_throttling_observer.h
index e20f3299..83fef409 100644
--- a/chrome/browser/chromeos/net/network_throttling_observer.h
+++ b/chrome/browser/ash/net/network_throttling_observer.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 CHROME_BROWSER_CHROMEOS_NET_NETWORK_THROTTLING_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_THROTTLING_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_NET_NETWORK_THROTTLING_OBSERVER_H_
+#define CHROME_BROWSER_ASH_NET_NETWORK_THROTTLING_OBSERVER_H_
#include <string>
@@ -41,4 +41,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_THROTTLING_OBSERVER_H_
+#endif // CHROME_BROWSER_ASH_NET_NETWORK_THROTTLING_OBSERVER_H_
diff --git a/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc b/chrome/browser/ash/net/network_throttling_observer_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/net/network_throttling_observer_unittest.cc
rename to chrome/browser/ash/net/network_throttling_observer_unittest.cc
index 2188dfd..221dcbb 100644
--- a/chrome/browser/chromeos/net/network_throttling_observer_unittest.cc
+++ b/chrome/browser/ash/net/network_throttling_observer_unittest.cc
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/net/network_throttling_observer.h"
+
#include <memory>
#include "base/test/task_environment.h"
-#include "chrome/browser/chromeos/net/network_throttling_observer.h"
#include "chrome/common/pref_names.h"
#include "chromeos/dbus/shill/shill_manager_client.h"
#include "chromeos/network/network_handler_test_helper.h"
diff --git a/chrome/browser/chromeos/net/system_proxy_manager.cc b/chrome/browser/ash/net/system_proxy_manager.cc
similarity index 99%
rename from chrome/browser/chromeos/net/system_proxy_manager.cc
rename to chrome/browser/ash/net/system_proxy_manager.cc
index 1b8ec547..d887787 100644
--- a/chrome/browser/chromeos/net/system_proxy_manager.cc
+++ b/chrome/browser/ash/net/system_proxy_manager.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 "chrome/browser/chromeos/net/system_proxy_manager.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include <string>
diff --git a/chrome/browser/chromeos/net/system_proxy_manager.h b/chrome/browser/ash/net/system_proxy_manager.h
similarity index 98%
rename from chrome/browser/chromeos/net/system_proxy_manager.h
rename to chrome/browser/ash/net/system_proxy_manager.h
index 01171dec..86d5238 100644
--- a/chrome/browser/chromeos/net/system_proxy_manager.h
+++ b/chrome/browser/ash/net/system_proxy_manager.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 CHROME_BROWSER_CHROMEOS_NET_SYSTEM_PROXY_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_NET_SYSTEM_PROXY_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_NET_SYSTEM_PROXY_MANAGER_H_
+#define CHROME_BROWSER_ASH_NET_SYSTEM_PROXY_MANAGER_H_
#include <memory>
#include <string>
@@ -294,4 +294,4 @@
using ::chromeos::SystemProxyManager;
} // namespace ash
-#endif // CHROME_BROWSER_CHROMEOS_NET_SYSTEM_PROXY_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_NET_SYSTEM_PROXY_MANAGER_H_
diff --git a/chrome/browser/chromeos/net/system_proxy_manager_browsertest.cc b/chrome/browser/ash/net/system_proxy_manager_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/system_proxy_manager_browsertest.cc
rename to chrome/browser/ash/net/system_proxy_manager_browsertest.cc
index 4b19288..e5a3a37 100644
--- a/chrome/browser/chromeos/net/system_proxy_manager_browsertest.cc
+++ b/chrome/browser/ash/net/system_proxy_manager_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ash/net/system_proxy_manager.h"
+
#include <set>
#include <string>
@@ -15,7 +17,6 @@
#include "chrome/browser/ash/policy/affiliation/affiliation_test_helper.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/notifications/notification_display_service_tester.h"
#include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/net/system_proxy_manager_unittest.cc b/chrome/browser/ash/net/system_proxy_manager_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/net/system_proxy_manager_unittest.cc
rename to chrome/browser/ash/net/system_proxy_manager_unittest.cc
index ca596bc..4845296b 100644
--- a/chrome/browser/chromeos/net/system_proxy_manager_unittest.cc
+++ b/chrome/browser/ash/net/system_proxy_manager_unittest.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 "chrome/browser/chromeos/net/system_proxy_manager.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "ash/constants/ash_features.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
index af47d13b..e742ca89 100644
--- a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
+++ b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/values.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/settings/cros_settings.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chromeos/network/network_event_log.h"
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/cros_settings_provider.h"
diff --git a/chrome/browser/ash/policy/handlers/system_proxy_handler_unittest.cc b/chrome/browser/ash/policy/handlers/system_proxy_handler_unittest.cc
index 5f80c8d9..64bf004 100644
--- a/chrome/browser/ash/policy/handlers/system_proxy_handler_unittest.cc
+++ b/chrome/browser/ash/policy/handlers/system_proxy_handler_unittest.cc
@@ -12,9 +12,9 @@
#include "base/task/current_thread.h"
#include "base/test/task_environment.h"
#include "base/values.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ash/system_logs/network_health_source.cc b/chrome/browser/ash/system_logs/network_health_source.cc
index 709049a..adf00d21 100644
--- a/chrome/browser/ash/system_logs/network_health_source.cc
+++ b/chrome/browser/ash/system_logs/network_health_source.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_service.h"
+#include "chrome/browser/ash/net/network_health/network_health_service.h"
#include "chromeos/network/network_event_log.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc
index b1df5b0..311938a 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.cc
+++ b/chrome/browser/browser_process_platform_part_chromeos.cc
@@ -16,6 +16,8 @@
#include "chrome/browser/ash/login/saml/in_session_password_change_manager.h"
#include "chrome/browser/ash/login/session/chrome_session_manager.h"
#include "chrome/browser/ash/login/users/chrome_user_manager_impl.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/settings/cros_settings.h"
@@ -27,8 +29,6 @@
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/net/delay_network_call.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/chromeos/scheduler_configuration_manager.h"
#include "chrome/browser/component_updater/metadata_table_chromeos.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index d430e9d..ca1b4af 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -64,9 +64,9 @@
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chromeos/dbus/system_proxy/system_proxy_client.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
index 6abc2b8..6245914 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -161,10 +161,10 @@
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chromeos/cryptohome/cryptohome_parameters.h"
#include "chromeos/dbus/attestation/attestation_client.h"
#include "chromeos/dbus/attestation/interface.pb.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 533155c..7b8e859 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -343,6 +343,7 @@
#include "chrome/browser/ash/login/signin/merge_session_throttling_utils.h"
#include "chrome/browser/ash/login/signin_partition_manager.h"
#include "chrome/browser/ash/login/startup_utils.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ash/policy/networking/policy_cert_service_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
@@ -353,7 +354,6 @@
#include "chrome/browser/chromeos/fileapi/external_file_url_loader_factory.h"
#include "chrome/browser/chromeos/fileapi/file_system_backend.h"
#include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/speech/tts_chromeos.h"
#include "chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h"
#include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 5c4d7e9e..48366b8 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -2074,6 +2074,75 @@
"../ash/nearby/nearby_process_manager_factory.h",
"../ash/nearby/nearby_process_manager_impl.cc",
"../ash/nearby/nearby_process_manager_impl.h",
+ "../ash/net/client_cert_filter.cc",
+ "../ash/net/client_cert_filter.h",
+ "../ash/net/client_cert_store_ash.cc",
+ "../ash/net/client_cert_store_ash.h",
+ "../ash/net/delay_network_call.cc",
+ "../ash/net/delay_network_call.h",
+ "../ash/net/dhcp_wpad_url_client.cc",
+ "../ash/net/dhcp_wpad_url_client.h",
+ "../ash/net/network_diagnostics/arc_dns_resolution_routine.cc",
+ "../ash/net/network_diagnostics/arc_dns_resolution_routine.h",
+ "../ash/net/network_diagnostics/arc_http_routine.cc",
+ "../ash/net/network_diagnostics/arc_http_routine.h",
+ "../ash/net/network_diagnostics/arc_ping_routine.cc",
+ "../ash/net/network_diagnostics/arc_ping_routine.h",
+ "../ash/net/network_diagnostics/captive_portal_routine.cc",
+ "../ash/net/network_diagnostics/captive_portal_routine.h",
+ "../ash/net/network_diagnostics/dns_latency_routine.cc",
+ "../ash/net/network_diagnostics/dns_latency_routine.h",
+ "../ash/net/network_diagnostics/dns_resolution_routine.cc",
+ "../ash/net/network_diagnostics/dns_resolution_routine.h",
+ "../ash/net/network_diagnostics/dns_resolver_present_routine.cc",
+ "../ash/net/network_diagnostics/dns_resolver_present_routine.h",
+ "../ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc",
+ "../ash/net/network_diagnostics/gateway_can_be_pinged_routine.h",
+ "../ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc",
+ "../ash/net/network_diagnostics/has_secure_wifi_connection_routine.h",
+ "../ash/net/network_diagnostics/host_resolver.cc",
+ "../ash/net/network_diagnostics/host_resolver.h",
+ "../ash/net/network_diagnostics/http_firewall_routine.cc",
+ "../ash/net/network_diagnostics/http_firewall_routine.h",
+ "../ash/net/network_diagnostics/http_request_manager.cc",
+ "../ash/net/network_diagnostics/http_request_manager.h",
+ "../ash/net/network_diagnostics/https_firewall_routine.cc",
+ "../ash/net/network_diagnostics/https_firewall_routine.h",
+ "../ash/net/network_diagnostics/https_latency_routine.cc",
+ "../ash/net/network_diagnostics/https_latency_routine.h",
+ "../ash/net/network_diagnostics/lan_connectivity_routine.cc",
+ "../ash/net/network_diagnostics/lan_connectivity_routine.h",
+ "../ash/net/network_diagnostics/network_diagnostics.cc",
+ "../ash/net/network_diagnostics/network_diagnostics.h",
+ "../ash/net/network_diagnostics/network_diagnostics_routine.cc",
+ "../ash/net/network_diagnostics/network_diagnostics_routine.h",
+ "../ash/net/network_diagnostics/network_diagnostics_util.cc",
+ "../ash/net/network_diagnostics/network_diagnostics_util.h",
+ "../ash/net/network_diagnostics/signal_strength_routine.cc",
+ "../ash/net/network_diagnostics/signal_strength_routine.h",
+ "../ash/net/network_diagnostics/tls_prober.cc",
+ "../ash/net/network_diagnostics/tls_prober.h",
+ "../ash/net/network_diagnostics/udp_prober.cc",
+ "../ash/net/network_diagnostics/udp_prober.h",
+ "../ash/net/network_diagnostics/video_conferencing_routine.cc",
+ "../ash/net/network_diagnostics/video_conferencing_routine.h",
+ "../ash/net/network_health/network_health.cc",
+ "../ash/net/network_health/network_health.h",
+ "../ash/net/network_health/network_health_constants.h",
+ "../ash/net/network_health/network_health_service.cc",
+ "../ash/net/network_health/network_health_service.h",
+ "../ash/net/network_health/signal_strength_tracker.cc",
+ "../ash/net/network_health/signal_strength_tracker.h",
+ "../ash/net/network_portal_detector_impl.cc",
+ "../ash/net/network_portal_detector_impl.h",
+ "../ash/net/network_portal_detector_test_impl.cc",
+ "../ash/net/network_portal_detector_test_impl.h",
+ "../ash/net/network_portal_web_dialog.cc",
+ "../ash/net/network_portal_web_dialog.h",
+ "../ash/net/network_pref_state_observer.cc",
+ "../ash/net/network_pref_state_observer.h",
+ "../ash/net/network_throttling_observer.cc",
+ "../ash/net/network_throttling_observer.h",
"../ash/net/rollback_network_config/rollback_network_config.cc",
"../ash/net/rollback_network_config/rollback_network_config.h",
"../ash/net/rollback_network_config/rollback_network_config_service.cc",
@@ -2082,6 +2151,8 @@
"../ash/net/rollback_network_config/rollback_onc_util.h",
"../ash/net/secure_dns_manager.cc",
"../ash/net/secure_dns_manager.h",
+ "../ash/net/system_proxy_manager.cc",
+ "../ash/net/system_proxy_manager.h",
"../ash/night_light/night_light_client.cc",
"../ash/night_light/night_light_client.h",
"../ash/notifications/adb_sideloading_policy_change_notification.cc",
@@ -3068,77 +3139,6 @@
"locale_change_guard.h",
"logging.cc",
"logging.h",
- "net/client_cert_filter.cc",
- "net/client_cert_filter.h",
- "net/client_cert_store_ash.cc",
- "net/client_cert_store_ash.h",
- "net/delay_network_call.cc",
- "net/delay_network_call.h",
- "net/dhcp_wpad_url_client.cc",
- "net/dhcp_wpad_url_client.h",
- "net/network_diagnostics/arc_dns_resolution_routine.cc",
- "net/network_diagnostics/arc_dns_resolution_routine.h",
- "net/network_diagnostics/arc_http_routine.cc",
- "net/network_diagnostics/arc_http_routine.h",
- "net/network_diagnostics/arc_ping_routine.cc",
- "net/network_diagnostics/arc_ping_routine.h",
- "net/network_diagnostics/captive_portal_routine.cc",
- "net/network_diagnostics/captive_portal_routine.h",
- "net/network_diagnostics/dns_latency_routine.cc",
- "net/network_diagnostics/dns_latency_routine.h",
- "net/network_diagnostics/dns_resolution_routine.cc",
- "net/network_diagnostics/dns_resolution_routine.h",
- "net/network_diagnostics/dns_resolver_present_routine.cc",
- "net/network_diagnostics/dns_resolver_present_routine.h",
- "net/network_diagnostics/gateway_can_be_pinged_routine.cc",
- "net/network_diagnostics/gateway_can_be_pinged_routine.h",
- "net/network_diagnostics/has_secure_wifi_connection_routine.cc",
- "net/network_diagnostics/has_secure_wifi_connection_routine.h",
- "net/network_diagnostics/host_resolver.cc",
- "net/network_diagnostics/host_resolver.h",
- "net/network_diagnostics/http_firewall_routine.cc",
- "net/network_diagnostics/http_firewall_routine.h",
- "net/network_diagnostics/http_request_manager.cc",
- "net/network_diagnostics/http_request_manager.h",
- "net/network_diagnostics/https_firewall_routine.cc",
- "net/network_diagnostics/https_firewall_routine.h",
- "net/network_diagnostics/https_latency_routine.cc",
- "net/network_diagnostics/https_latency_routine.h",
- "net/network_diagnostics/lan_connectivity_routine.cc",
- "net/network_diagnostics/lan_connectivity_routine.h",
- "net/network_diagnostics/network_diagnostics.cc",
- "net/network_diagnostics/network_diagnostics.h",
- "net/network_diagnostics/network_diagnostics_routine.cc",
- "net/network_diagnostics/network_diagnostics_routine.h",
- "net/network_diagnostics/network_diagnostics_util.cc",
- "net/network_diagnostics/network_diagnostics_util.h",
- "net/network_diagnostics/signal_strength_routine.cc",
- "net/network_diagnostics/signal_strength_routine.h",
- "net/network_diagnostics/tls_prober.cc",
- "net/network_diagnostics/tls_prober.h",
- "net/network_diagnostics/udp_prober.cc",
- "net/network_diagnostics/udp_prober.h",
- "net/network_diagnostics/video_conferencing_routine.cc",
- "net/network_diagnostics/video_conferencing_routine.h",
- "net/network_health/network_health.cc",
- "net/network_health/network_health.h",
- "net/network_health/network_health_constants.h",
- "net/network_health/network_health_service.cc",
- "net/network_health/network_health_service.h",
- "net/network_health/signal_strength_tracker.cc",
- "net/network_health/signal_strength_tracker.h",
- "net/network_portal_detector_impl.cc",
- "net/network_portal_detector_impl.h",
- "net/network_portal_detector_test_impl.cc",
- "net/network_portal_detector_test_impl.h",
- "net/network_portal_web_dialog.cc",
- "net/network_portal_web_dialog.h",
- "net/network_pref_state_observer.cc",
- "net/network_pref_state_observer.h",
- "net/network_throttling_observer.cc",
- "net/network_throttling_observer.h",
- "net/system_proxy_manager.cc",
- "net/system_proxy_manager.h",
"network_change_manager_client.cc",
"network_change_manager_client.h",
"note_taking_controller_client.cc",
@@ -4075,8 +4075,45 @@
"../ash/mobile/mobile_activator_unittest.cc",
"../ash/nearby/bluetooth_adapter_manager_unittest.cc",
"../ash/nearby/nearby_process_manager_impl_unittest.cc",
+ "../ash/net/client_cert_store_ash_unittest.cc",
+ "../ash/net/network_diagnostics/arc_dns_resolution_routine_unittest.cc",
+ "../ash/net/network_diagnostics/arc_http_routine_unittest.cc",
+ "../ash/net/network_diagnostics/arc_ping_routine_unittest.cc",
+ "../ash/net/network_diagnostics/captive_portal_routine_unittest.cc",
+ "../ash/net/network_diagnostics/dns_latency_routine_unittest.cc",
+ "../ash/net/network_diagnostics/dns_resolution_routine_unittest.cc",
+ "../ash/net/network_diagnostics/dns_resolver_present_routine_unittest.cc",
+ "../ash/net/network_diagnostics/fake_host_resolver.cc",
+ "../ash/net/network_diagnostics/fake_host_resolver.h",
+ "../ash/net/network_diagnostics/fake_network_context.cc",
+ "../ash/net/network_diagnostics/fake_network_context.h",
+ "../ash/net/network_diagnostics/fake_tcp_connected_socket.cc",
+ "../ash/net/network_diagnostics/fake_tcp_connected_socket.h",
+ "../ash/net/network_diagnostics/fake_udp_socket.cc",
+ "../ash/net/network_diagnostics/fake_udp_socket.h",
+ "../ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc",
+ "../ash/net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc",
+ "../ash/net/network_diagnostics/host_resolver_unittest.cc",
+ "../ash/net/network_diagnostics/http_firewall_routine_unittest.cc",
+ "../ash/net/network_diagnostics/http_request_manager_unittest.cc",
+ "../ash/net/network_diagnostics/https_firewall_routine_unittest.cc",
+ "../ash/net/network_diagnostics/https_latency_routine_unittest.cc",
+ "../ash/net/network_diagnostics/lan_connectivity_routine_unittest.cc",
+ "../ash/net/network_diagnostics/network_diagnostics_routine_unittest.cc",
+ "../ash/net/network_diagnostics/network_diagnostics_unittest.cc",
+ "../ash/net/network_diagnostics/network_diagnostics_util_unittest.cc",
+ "../ash/net/network_diagnostics/signal_strength_routine_unittest.cc",
+ "../ash/net/network_diagnostics/tls_prober_unittest.cc",
+ "../ash/net/network_diagnostics/udp_prober_unittest.cc",
+ "../ash/net/network_diagnostics/video_conferencing_routine_unittest.cc",
+ "../ash/net/network_health/network_health_unittest.cc",
+ "../ash/net/network_health/signal_strength_tracker_unittest.cc",
+ "../ash/net/network_portal_detector_impl_unittest.cc",
+ "../ash/net/network_pref_state_observer_unittest.cc",
+ "../ash/net/network_throttling_observer_unittest.cc",
"../ash/net/rollback_network_config/rollback_network_config_unittest.cc",
"../ash/net/secure_dns_manager_unittest.cc",
+ "../ash/net/system_proxy_manager_unittest.cc",
"../ash/night_light/night_light_client_unittest.cc",
"../ash/notifications/debugd_notification_handler_unittest.cc",
"../ash/notifications/deprecation_notification_controller_unittest.cc",
@@ -4384,43 +4421,6 @@
"fileapi/recent_model_unittest.cc",
"fileapi/test/fake_recent_source.cc",
"locale_change_guard_unittest.cc",
- "net/client_cert_store_ash_unittest.cc",
- "net/network_diagnostics/arc_dns_resolution_routine_unittest.cc",
- "net/network_diagnostics/arc_http_routine_unittest.cc",
- "net/network_diagnostics/arc_ping_routine_unittest.cc",
- "net/network_diagnostics/captive_portal_routine_unittest.cc",
- "net/network_diagnostics/dns_latency_routine_unittest.cc",
- "net/network_diagnostics/dns_resolution_routine_unittest.cc",
- "net/network_diagnostics/dns_resolver_present_routine_unittest.cc",
- "net/network_diagnostics/fake_host_resolver.cc",
- "net/network_diagnostics/fake_host_resolver.h",
- "net/network_diagnostics/fake_network_context.cc",
- "net/network_diagnostics/fake_network_context.h",
- "net/network_diagnostics/fake_tcp_connected_socket.cc",
- "net/network_diagnostics/fake_tcp_connected_socket.h",
- "net/network_diagnostics/fake_udp_socket.cc",
- "net/network_diagnostics/fake_udp_socket.h",
- "net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc",
- "net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc",
- "net/network_diagnostics/host_resolver_unittest.cc",
- "net/network_diagnostics/http_firewall_routine_unittest.cc",
- "net/network_diagnostics/http_request_manager_unittest.cc",
- "net/network_diagnostics/https_firewall_routine_unittest.cc",
- "net/network_diagnostics/https_latency_routine_unittest.cc",
- "net/network_diagnostics/lan_connectivity_routine_unittest.cc",
- "net/network_diagnostics/network_diagnostics_routine_unittest.cc",
- "net/network_diagnostics/network_diagnostics_unittest.cc",
- "net/network_diagnostics/network_diagnostics_util_unittest.cc",
- "net/network_diagnostics/signal_strength_routine_unittest.cc",
- "net/network_diagnostics/tls_prober_unittest.cc",
- "net/network_diagnostics/udp_prober_unittest.cc",
- "net/network_diagnostics/video_conferencing_routine_unittest.cc",
- "net/network_health/network_health_unittest.cc",
- "net/network_health/signal_strength_tracker_unittest.cc",
- "net/network_portal_detector_impl_unittest.cc",
- "net/network_pref_state_observer_unittest.cc",
- "net/network_throttling_observer_unittest.cc",
- "net/system_proxy_manager_unittest.cc",
"network_change_manager_client_unittest.cc",
"note_taking_helper_unittest.cc",
"platform_keys/key_permissions/arc_key_permissions_manager_delegate_unittest.cc",
diff --git a/chrome/browser/chromeos/README.md b/chrome/browser/chromeos/README.md
index 0947ee6..b475057 100644
--- a/chrome/browser/chromeos/README.md
+++ b/chrome/browser/chromeos/README.md
@@ -12,9 +12,9 @@
Example:
* The Chrome OS network portal detection model lives in
- `chrome/browser/chromeos/net/network_portal_detector_impl.cc`.
+ `chrome/browser/ash/net/network_portal_detector_impl.cc`.
* The notification controller for network portal detection lives in:
`chrome/browser/ui/ash/network/network_portal_notification_controller.cc`
(which depends on *chrome/browser/ui*, and
- *chrome/browser/chromeos/net/network_portal_detector_impl.h*.
+ *chrome/browser/ash/net/network_portal_detector_impl.h*.
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 2b16d70..2fd6914 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -96,7 +96,12 @@
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/login/users/chrome_user_manager.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/net/network_health/network_health_service.h"
+#include "chrome/browser/ash/net/network_portal_detector_impl.h"
+#include "chrome/browser/ash/net/network_pref_state_observer.h"
+#include "chrome/browser/ash/net/network_throttling_observer.h"
#include "chrome/browser/ash/net/rollback_network_config/rollback_network_config_service.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/notifications/debugd_notification_handler.h"
#include "chrome/browser/ash/notifications/gnubby_notification.h"
#include "chrome/browser/ash/notifications/low_disk_notification.h"
@@ -134,11 +139,6 @@
#include "chrome/browser/chromeos/external_metrics.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/logging.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_service.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
-#include "chrome/browser/chromeos/net/network_pref_state_observer.h"
-#include "chrome/browser/chromeos/net/network_throttling_observer.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/chromeos/network_change_manager_client.h"
#include "chrome/browser/chromeos/note_taking_helper.h"
#include "chrome/browser/chromeos/platform_keys/key_permissions/key_permissions_manager_impl.h"
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
index 49e37ad..7fa3f1d2e 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
@@ -11,8 +11,8 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider.h"
+#include "chrome/browser/ash/net/client_cert_store_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/net/client_cert_store_ash.h"
#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
#include "chrome/browser/net/nss_context.h"
#include "chrome/browser/profiles/incognito_helpers.h"
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
index 2a57ca7..613d8fa 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc
@@ -30,9 +30,9 @@
#include "base/strings/string_piece.h"
#include "base/task/thread_pool.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/ash/net/client_cert_store_ash.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/net/client_cert_store_ash.h"
#include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h"
#include "chrome/browser/platform_keys/platform_keys.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index 1debddd..08f7634c 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -84,7 +84,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/ash/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chromeos/network/network_handler.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
index b1e4150..2466c82 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -68,10 +68,10 @@
#include "chrome/browser/ash/certificate_provider/certificate_provider.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider_service.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider_service_factory.h"
+#include "chrome/browser/ash/net/client_cert_store_ash.h"
#include "chrome/browser/ash/policy/networking/policy_cert_service.h"
#include "chrome/browser/ash/policy/networking/policy_cert_service_factory.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/net/client_cert_store_ash.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index c76b724..0ab4c2a 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -44,7 +44,7 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/net/dhcp_wpad_url_client.h"
+#include "chrome/browser/ash/net/dhcp_wpad_url_client.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
namespace {
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
index db3d6b4..d44290c 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -74,9 +74,9 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/net/dhcp_wpad_url_client.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/net/dhcp_wpad_url_client.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 320b0ba..86961c7 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -185,10 +185,10 @@
#include "chrome/browser/ash/device_name/device_name_store.h"
#include "chrome/browser/ash/kerberos/kerberos_credentials_manager.h"
#include "chrome/browser/ash/login/easy_unlock/easy_unlock_service.h"
+#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/policy/handlers/system_features_disable_list_policy_handler.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/chromeos/extensions/extensions_permissions_tracker.h"
-#include "chrome/browser/chromeos/net/system_proxy_manager.h"
#include "chrome/browser/chromeos/platform_keys/key_permissions/key_permissions_manager_impl.h"
#include "chrome/browser/component_updater/metadata_table_chromeos.h"
#include "chrome/browser/ui/webui/signin/inline_login_handler_chromeos.h"
@@ -321,6 +321,7 @@
#include "chrome/browser/ash/login/users/avatar/user_image_sync_observer.h"
#include "chrome/browser/ash/login/users/chrome_user_manager_impl.h"
#include "chrome/browser/ash/login/users/multi_profile_user_controller.h"
+#include "chrome/browser/ash/net/network_throttling_observer.h"
#include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
@@ -347,7 +348,6 @@
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/chromeos/extensions/echo_private_api.h"
#include "chrome/browser/chromeos/extensions/login_screen/login/login_api.h"
-#include "chrome/browser/chromeos/net/network_throttling_observer.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/printing/cups_printers_manager.h"
#include "chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos.h"
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
index c634c3d..612f091 100644
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -54,7 +54,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/net/delay_network_call.h"
+#include "chrome/browser/ash/net/delay_network_call.h"
#include "chromeos/network/network_handler.h"
#endif
diff --git a/chrome/browser/sync/test/integration/secondary_account_helper.cc b/chrome/browser/sync/test/integration/secondary_account_helper.cc
index fa7f731..447e0a2 100644
--- a/chrome/browser/sync/test/integration/secondary_account_helper.cc
+++ b/chrome/browser/sync/test/integration/secondary_account_helper.cc
@@ -15,7 +15,7 @@
#include "components/signin/public/identity_manager/primary_account_mutator.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chromeos/network/network_handler.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
index 17c017872..efe7cc9a 100644
--- a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
+++ b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
@@ -19,8 +19,8 @@
#include "base/memory/ref_counted.h"
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/ash/mobile/mobile_activator.h"
+#include "chrome/browser/ash/net/network_portal_web_dialog.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/net/network_portal_web_dialog.h"
#include "chrome/browser/notifications/notification_handler.h"
#include "chrome/browser/notifications/system_notification_helper.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 26a5d6a..344ff37 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -177,6 +177,7 @@
#include "chrome/browser/ash/login/easy_unlock/easy_unlock_service_factory.h"
#include "chrome/browser/ash/login/login_pref_names.h"
#include "chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.h"
+#include "chrome/browser/ash/net/network_health/network_health_service.h"
#include "chrome/browser/ash/printing/print_management/printing_manager.h"
#include "chrome/browser/ash/printing/print_management/printing_manager_factory.h"
#include "chrome/browser/ash/scanning/chrome_scanning_app_delegate.h"
@@ -189,7 +190,6 @@
#include "chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.h"
#include "chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_ui_delegate.h"
#include "chrome/browser/chromeos/eche_app/eche_app_manager_factory.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_service.h"
#include "chrome/browser/feedback/feedback_dialog_utils.h"
#include "chrome/browser/nearby_sharing/nearby_sharing_service_factory.h"
#include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h"
diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
index afee3e3..eca9acf 100644
--- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
@@ -11,7 +11,7 @@
#include "base/test/bind.h"
#include "base/test/task_environment.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
+#include "chrome/browser/ash/net/network_portal_detector_test_impl.h"
#include "chromeos/dbus/shill/shill_clients.h"
#include "chromeos/network/network_handler.h"
#include "chromeos/network/network_handler_test_helper.h"
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc
index b4c0990..aab5c63b 100644
--- a/chrome/browser/ui/webui/chromeos/network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc
@@ -14,7 +14,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/net/network_health/network_health_service.h"
+#include "chrome/browser/ash/net/network_health/network_health_service.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/ui/ash/system_tray_client_impl.h"
#include "chrome/browser/ui/chrome_pages.h"
