Revert "Remove superfluous includes from navigation_controller.h"

This reverts commit 219c8e4.

Reason for revert:

Note: It is reported that sheriffs cannot submit CL created by Findit
(crbug.com/1187426). A workaround in the mean time is to abandon this
CL and create another revert CL.

Findit (https://goo.gl/kROfz5) identified CL at revision 897779 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzIxOWM4ZTQwYjQxZmEwODBjNTY5M2JmYzBmOTJiMjFkZWQxODMyOGMM

Sample Failed Build: https://ci.chromium.org/b/8842896488727742064

Sample Failed Step: compile

Original change's description:
> Remove superfluous includes from navigation_controller.h
> 
> NavigationHandle and SharedUrlLoaderFactory add lots of unnecessary
> indirect includes to navigation_controller.h. Remove them and fix
> broken files that relied on these includes.
> 
> Bug: 242216
> Change-Id: I4a9e95915187849eed45f55518cea539f186ee4c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2999323
> Commit-Queue: Christian Dullweber <dullweber@chromium.org>
> Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> Owners-Override: Jochen Eisinger <jochen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#897779}


Change-Id: Id8cf6670212816702b843d7dd67e76f77f6ac5f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 242216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3000837
Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>
Commit-Queue: Matthew Wolenetz <wolenetz@chromium.org>
Owners-Override: Matthew Wolenetz <wolenetz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#897804}

chrome/browser/ash/app_mode/kiosk_session_plugin_handler.h

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "base/timer/timer.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace base {

chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc

@@ -46,7 +46,6 @@
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/proxy_config/proxy_prefs.h"
 #include "content/public/test/browser_test.h"
-#include "net/proxy_resolution/proxy_bypass_rules.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 

chrome/browser/ash/file_manager/file_manager_browsertest_base.cc

@@ -12,8 +12,8 @@
 
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/webui/file_manager/url_constants.h"
+#include "ash/public/cpp/test/shell_test_api.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/containers/circular_deque.h"
@@ -96,7 +96,6 @@
 #include "components/drive/drive_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"

chrome/browser/availability/availability_prober_browsertest.cc

@@ -22,7 +22,6 @@
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/mojom/network_service_test.mojom.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 
 namespace {
 

chrome/browser/browser_about_handler_unittest.cc

@@ -17,7 +17,6 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/browser_task_environment.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 

chrome/browser/device_identity/device_oauth2_token_service_unittest.cc

@@ -26,7 +26,6 @@
 #include "google_apis/gaia/oauth2_access_token_manager_test_util.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "services/network/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/dom_distiller/test_distillation_observers.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/dom_distiller/test_distillation_observers.h"
 #include "components/dom_distiller/core/url_constants.h"
-#include "url/gurl.h"
 
 namespace dom_distiller {
 

chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc

@@ -43,7 +43,6 @@
 #include "extensions/common/manifest_handlers/oauth2_manifest_handler.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/app_mode/app_mode_utils.h"

chrome/browser/federated_learning/floc_event_logger_unittest.cc

@@ -15,7 +15,6 @@
 #include "components/sync_user_events/fake_user_event_service.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_utils.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace federated_learning {

chrome/browser/lookalikes/digital_asset_links_cross_validator.cc

@@ -8,7 +8,6 @@
 #include "base/time/clock.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/lookalikes/core/lookalike_url_util.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace {
 const char* kDigitalAssetLinkRecordType = "lookalikes/allowlist";

chrome/browser/net/file_downloader_unittest.cc

@@ -14,7 +14,6 @@
 #include "net/http/http_status_code.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/net/proxy_test_utils.cc

@@ -9,7 +9,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/test/url_loader_interceptor.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "net/proxy_resolution/proxy_bypass_rules.h"
 
 ProxyBrowserTest::ProxyBrowserTest()
     : proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY,

chrome/browser/profile_resetter/profile_resetter_unittest.cc

@@ -54,7 +54,6 @@
 #include "net/http/http_util.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
 #include "services/network/public/cpp/resource_request.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "services/network/test/test_utils.h"
 #include "url/gurl.h"

chrome/browser/safe_browsing/threat_details_unittest.cc

@@ -38,7 +38,6 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc

@@ -26,7 +26,6 @@
 #include "services/network/public/mojom/early_hints.mojom.h"
 #include "services/network/public/mojom/fetch_api.mojom-shared.h"
 #include "services/network/public/mojom/url_loader.mojom.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/tab_android.h"

chrome/browser/signin/token_revoker_test_utils.cc

@@ -7,7 +7,6 @@
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace token_revoker_test_utils {
 

chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h

@@ -28,10 +28,6 @@ class SharedURLLoaderFactory;
 class SimpleURLLoader;
 }
 
-namespace net {
-struct RedirectInfo;
-}
-
 // Monitors omnibox navigations in order to trigger behaviors that depend on
 // successful navigations.
 //

chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc

@@ -29,7 +29,6 @@
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "services/network/test/test_utils.h"
 

chrome/browser/ui/webui/identity_internals_ui.cc

@@ -24,7 +24,6 @@
 #include "content/public/browser/web_ui_message_handler.h"
 #include "extensions/browser/extension_registry.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace {
 

chrome/browser/web_applications/system_web_apps/test/system_web_app_manager_unittest.cc

@@ -46,7 +46,6 @@
 #include "chrome/browser/web_applications/web_app_install_manager.h"
 #include "chrome/browser/web_applications/web_app_sync_bridge.h"
 #include "chrome/common/chrome_features.h"
-#include "content/public/browser/navigation_handle.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/idle/idle.h"

chrome/renderer/lite_video/lite_video_hint_agent_browsertest.cc

@@ -15,7 +15,6 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/platform/web_network_state_notifier.h"

chrome/renderer/subresource_redirect/login_robots_url_loader_throttle_browsertest.cc

@@ -15,7 +15,6 @@
 #include "content/public/renderer/render_view.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/mojom/fetch_api.mojom-shared.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"

components/digital_asset_links/DEPS

@@ -4,6 +4,5 @@ include_rules = [
   "+net",
   "+services/data_decoder/public",
   "+services/network/public/cpp",
-  "+services/network/public/mojom",
   "+services/network/test",
 ]

components/digital_asset_links/digital_asset_links_handler_unittest.cc

@@ -16,7 +16,6 @@
 #include "net/http/http_status_code.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/safe_browsing/content/browser/password_protection/password_protection_service_unittest.cc

@@ -51,7 +51,6 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "testing/gmock/include/gmock/gmock.h"

components/sessions/content/DEPS

@@ -8,5 +8,4 @@ include_rules = [
   "+third_party/blink/public/common/user_agent/user_agent_metadata.h",
   "+third_party/blink/public/platform",
   "+services/network/public/mojom/referrer_policy.mojom.h",
-  "+services/network/public/cpp/shared_url_loader_factory.h",
-]
+]

components/sessions/content/content_serialized_navigation_builder.cc

@@ -19,7 +19,6 @@
 #include "content/public/browser/navigation_entry_restore_context.h"
 #include "content/public/browser/replaced_navigation_entry_data.h"
 #include "content/public/common/referrer.h"
-#include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "third_party/blink/public/common/page_state/page_state.h"
 
 namespace sessions {

content/browser/devtools/render_frame_devtools_agent_host.cc

@@ -58,7 +58,6 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/network_service_instance.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"

content/browser/find_request_manager.cc

@@ -13,7 +13,6 @@
 #include "content/browser/find_in_page_client.h"
 #include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/render_frame_host.h"
 
 namespace content {
 

content/browser/find_request_manager.h

@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/containers/queue.h"
-#include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/stop_find_action.h"

content/browser/loader/navigation_early_hints_manager.cc

@@ -21,7 +21,6 @@
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/mojom/fetch_api.mojom.h"
 #include "services/network/public/mojom/url_loader.mojom.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 #include "third_party/blink/public/common/loader/throttling_url_loader.h"
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
 #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"

content/browser/renderer_host/render_frame_host_impl.h

@@ -61,7 +61,6 @@
 #include "content/common/render_accessibility.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/global_request_id.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/peak_gpu_memory_tracker.h"

content/browser/web_contents/file_chooser_impl.h

@@ -9,7 +9,6 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/file_select_listener.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h"
 
 namespace content {

content/browser/web_package/web_bundle_redirect_url_loader.cc

@@ -9,7 +9,6 @@
 #include "net/http/http_util.h"
 #include "net/url_request/redirect_info.h"
 #include "services/network/public/cpp/resource_request.h"
-#include "services/network/public/mojom/url_response_head.mojom.h"
 
 namespace content {
 

content/public/browser/navigation_controller.h

@@ -16,6 +16,7 @@
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/reload_type.h"
 #include "content/public/browser/render_frame_host.h"
@@ -24,8 +25,8 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/referrer.h"
-#include "net/base/net_errors.h"
 #include "services/network/public/cpp/resource_request_body.h"
+#include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/navigation/impression.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
@@ -35,12 +36,10 @@
 #include "url/origin.h"
 
 namespace base {
+
 class RefCountedString;
-}  // namespace base
 
-namespace network {
-class SharedURLLoaderFactory;
-}  // namespace network
+}  // namespace base
 
 namespace content {
 
@@ -49,7 +48,6 @@ class BrowserContext;
 class NavigationEntry;
 class RenderFrameHost;
 class WebContents;
-class NavigationHandle;
 struct OpenURLParams;
 
 // A NavigationController maintains the back-forward list for a WebContents and

content/public/browser/web_contents_observer.h

@@ -14,10 +14,9 @@
 #include "components/viz/common/vertical_scroll_direction.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/allow_service_worker_result.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/reload_type.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/visibility.h"
-#include "ipc/ipc_message.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/network/public/mojom/fetch_api.mojom-forward.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
@@ -32,8 +31,6 @@
 #include "ui/base/page_transition_types.h"
 #include "ui/base/window_open_disposition.h"
 
-class GURL;
-
 namespace blink {
 namespace mojom {
 enum class ViewportFit;
@@ -55,14 +52,13 @@ class RenderWidgetHost;
 class WebContents;
 struct AXEventNotificationDetails;
 struct AXLocationChangeNotificationDetails;
-struct CookieAccessDetails;
 struct EntryChangedDetails;
 struct FocusedNodeDetails;
-struct GlobalRequestID;
 struct LoadCommittedDetails;
 struct MediaPlayerId;
 struct PrunedDetails;
 struct Referrer;
+struct CookieAccessDetails;
 
 // An observer API implemented by classes which are interested in various page
 // events from WebContents.  They also get a chance to filter IPC messages.

content/public/test/mock_web_contents_observer.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "content/public/test/mock_web_contents_observer.h"
-#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
 
 namespace content {
 

content/public/test/navigation_handle_observer.h

@@ -5,18 +5,12 @@
 #ifndef CONTENT_PUBLIC_TEST_NAVIGATION_HANDLE_OBSERVER_H_
 #define CONTENT_PUBLIC_TEST_NAVIGATION_HANDLE_OBSERVER_H_
 
-#include <cstdint>
 #include "base/macros.h"
 #include "content/public/browser/navigation_handle_timing.h"
 #include "content/public/browser/reload_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "net/base/auth.h"
-#include "net/base/net_errors.h"
-#include "net/dns/public/resolve_error_info.h"
-#include "net/http/http_response_headers.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
-#include "url/gurl.h"
 
 namespace content {
 

content/public/test/test_navigation_observer.h

@@ -12,7 +12,6 @@
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/macros.h"
 #include "content/public/browser/navigation_type.h"
-#include "content/public/common/child_process_host.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"