Revert "Android: Move #include of _jni.h headers to after other headers"

This reverts commit 6a66fe96d7.

Reason for revert: Build failure:
https://ci.chromium.org/ui/p/chromium/builders/ci/Cast%20Android%20(dbg)/239379/overview

Original change's description:
> Android: Move #include of _jni.h headers to after other headers
>
> Scripted change that ignores includes within #if blocks:
> https://gist.github.com/agrieve/9b4ad9ef78955032a6db453b4b15dac0
>
> No-Try: true
> Bug: 334905258
> Change-Id: I9c60f2d6e91d93d213fca5cceee52f6c0df55542
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5575995
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1307450}

No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 334905258
Change-Id: I37a20e8850fb9ffd5b7af28fd1f6717220437ba9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5581850
Owners-Override: Francois Pierre Doray <fdoray@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Francois Pierre Doray <fdoray@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1307464}

android_webview/browser/android_protocol_handler.cc

@@ -7,6 +7,7 @@
 #include <memory>
 #include <utility>
 
+#include "android_webview/browser_jni_headers/AndroidProtocolHandler_jni.h"
 #include "android_webview/common/url_constants.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ -21,9 +22,6 @@
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AndroidProtocolHandler_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ClearException;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/aw_browser_context.cc

@@ -23,6 +23,7 @@
 #include "android_webview/browser/metrics/aw_metrics_service_client.h"
 #include "android_webview/browser/network_service/net_helpers.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager.h"
+#include "android_webview/browser_jni_headers/AwBrowserContext_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
@@ -81,9 +82,6 @@
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwBrowserContext_jni.h"
-
 using base::FilePath;
 using content::BrowserThread;
 

android_webview/browser/aw_browser_context_store.cc

@@ -11,6 +11,7 @@
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_process.h"
+#include "android_webview/browser_jni_headers/AwBrowserContextStore_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/check_op.h"
 #include "base/feature_list.h"
@@ -29,9 +30,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwBrowserContextStore_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/browser/aw_browser_main_parts.cc

@@ -18,6 +18,7 @@
 #include "android_webview/browser/metrics/system_state_util.h"
 #include "android_webview/browser/network_service/aw_network_change_notifier_factory.h"
 #include "android_webview/browser/tracing/background_tracing_field_trial.h"
+#include "android_webview/browser_jni_headers/AwInterfaceRegistrar_jni.h"
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_resource.h"
@@ -68,9 +69,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gl/gl_surface.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwInterfaceRegistrar_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/browser/aw_browser_process.cc

@@ -9,6 +9,7 @@
 #include "android_webview/browser/component_updater/registration.h"
 #include "android_webview/browser/lifecycle/aw_contents_lifecycle_notifier.h"
 #include "android_webview/browser/metrics/visibility_metrics_logger.h"
+#include "android_webview/browser_jni_headers/AwBrowserProcess_jni.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -26,9 +27,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/process_visibility_util.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwBrowserProcess_jni.h"
-
 using content::BrowserThread;
 
 namespace android_webview {

android_webview/browser/aw_contents.cc

@@ -35,6 +35,8 @@
 #include "android_webview/browser/permission/permission_request_handler.h"
 #include "android_webview/browser/permission/simple_permission_request.h"
 #include "android_webview/browser/state_serializer.h"
+#include "android_webview/browser_jni_headers/AwContents_jni.h"
+#include "android_webview/browser_jni_headers/StartupJavascriptInfo_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/devtools_instrumentation.h"
@@ -110,10 +112,6 @@
 #include "url/origin.h"
 #include "url/url_constants.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContents_jni.h"
-#include "android_webview/browser_jni_headers/StartupJavascriptInfo_jni.h"
-
 struct AwDrawSWFunctionTable;
 
 using base::android::AppendJavaStringArrayToStringVector;

android_webview/browser/aw_contents_client_bridge.cc

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "android_webview/browser/network_service/net_helpers.h"
+#include "android_webview/browser_jni_headers/AwContentsClientBridge_jni.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/grit/components_strings.h"
 #include "base/android/jni_android.h"
@@ -33,9 +34,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContentsClientBridge_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/aw_contents_client_bridge_unittest.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "android_webview/test/android_webview_unittests_jni/MockAwContentsClientBridge_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/scoped_java_ref.h"
@@ -22,9 +23,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/boringssl/src/include/openssl/ssl.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/android_webview_unittests_jni/MockAwContentsClientBridge_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 using net::SSLCertRequestInfo;

android_webview/browser/aw_contents_io_thread_client.cc

@@ -12,6 +12,8 @@
 #include "android_webview/browser/aw_settings.h"
 #include "android_webview/browser/network_service/aw_web_resource_intercept_response.h"
 #include "android_webview/browser/network_service/aw_web_resource_request.h"
+#include "android_webview/browser_jni_headers/AwContentsBackgroundThreadClient_jni.h"
+#include "android_webview/browser_jni_headers/AwContentsIoThreadClient_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "base/android/jni_array.h"
@@ -40,10 +42,6 @@
 #include "net/base/data_url.h"
 #include "services/network/public/cpp/resource_request.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContentsBackgroundThreadClient_jni.h"
-#include "android_webview/browser_jni_headers/AwContentsIoThreadClient_jni.h"
-
 using base::LazyInstance;
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/aw_contents_origin_matcher.cc

@@ -4,14 +4,12 @@
 
 #include "android_webview/browser/aw_contents_origin_matcher.h"
 
+#include "android_webview/browser_jni_headers/AwContentsOriginMatcher_jni.h"
 
 #include "components/js_injection/common/origin_matcher.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContentsOriginMatcher_jni.h"
-
 namespace android_webview {
 
 AwContentsOriginMatcher::AwContentsOriginMatcher()

android_webview/browser/aw_contents_statics.cc

@@ -8,6 +8,7 @@
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_crash_keys.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager.h"
+#include "android_webview/browser_jni_headers/AwContentsStatics_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ -26,9 +27,6 @@
 #include "content/public/common/url_constants.h"
 #include "net/cert/cert_database.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContentsStatics_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;

android_webview/browser/aw_crashy_class_utils.cc

@@ -4,12 +4,10 @@
 
 #include <ostream>
 
+#include "android_webview/browser_jni_headers/AwCrashyClassUtils_jni.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwCrashyClassUtils_jni.h"
-
 namespace android_webview {
 
 // Do not inline this function. This is meant to simulate a crash like we would

android_webview/browser/aw_dark_mode.cc

@@ -5,6 +5,7 @@
 #include "android_webview/browser/aw_dark_mode.h"
 
 #include "android_webview/browser/aw_contents.h"
+#include "android_webview/browser_jni_headers/AwDarkMode_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/ptr_util.h"
@@ -14,9 +15,6 @@
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwDarkMode_jni.h"
-
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 

android_webview/browser/aw_devtools_server.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "android_webview/browser_jni_headers/AwDevToolsServer_jni.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/functional/bind.h"
@@ -21,9 +22,6 @@
 #include "net/socket/tcp_server_socket.h"
 #include "net/socket/unix_domain_server_socket_posix.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwDevToolsServer_jni.h"
-
 using base::android::JavaParamRef;
 using content::DevToolsAgentHost;
 

android_webview/browser/aw_feature_map.cc

@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "android_webview/browser_jni_headers/AwFeatureMap_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/feature_map.h"
 #include "base/feature_list.h"
@@ -12,9 +13,6 @@
 #include "components/embedder_support/android/metrics/features.h"
 #include "components/safe_browsing/core/common/features.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwFeatureMap_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/browser/aw_http_auth_handler.cc

@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "android_webview/browser/aw_contents.h"
+#include "android_webview/browser_jni_headers/AwHttpAuthHandler_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/functional/bind.h"
@@ -16,9 +17,6 @@
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwHttpAuthHandler_jni.h"
-
 using base::android::ConvertJavaStringToUTF16;
 using base::android::JavaParamRef;
 using content::BrowserThread;

android_webview/browser/aw_ip_protection_proxy_bypass_info.cc

@@ -3,15 +3,13 @@
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_ip_protection_proxy_bypass_info.h"
+#include "android_webview/browser_jni_headers/ExclusionUtilities_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/ExclusionUtilities_jni.h"
-
 namespace android_webview {
 
 std::vector<std::string> LoadExclusionList() {

android_webview/browser/aw_net_logs_connection.cc

@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "android_webview/browser_jni_headers/AwNetLogsConnection_jni.h"
 #include "base/base64.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ -18,9 +19,6 @@
 #include "net/log/net_log.h"
 #include "net/log/net_log_util.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwNetLogsConnection_jni.h"
-
 using base::android::JavaParamRef;
 
 namespace android_webview {

android_webview/browser/aw_pac_processor.cc

@@ -13,6 +13,7 @@
 #include <memory>
 #include <string>
 
+#include "android_webview/browser_jni_headers/AwPacProcessor_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -30,9 +31,6 @@
 #include "net/proxy_resolution/pac_file_data.h"
 #include "net/proxy_resolution/proxy_info.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwPacProcessor_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/aw_pdf_exporter.cc

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "android_webview/browser/aw_print_manager.h"
+#include "android_webview/browser_jni_headers/AwPdfExporter_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/functional/bind.h"
@@ -16,9 +17,6 @@
 #include "printing/print_settings.h"
 #include "printing/units.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwPdfExporter_jni.h"
-
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;

android_webview/browser/aw_proxy_controller.cc

@@ -5,6 +5,7 @@
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_process.h"
 #include "android_webview/browser/network_service/aw_proxy_config_monitor.h"
+#include "android_webview/browser_jni_headers/AwProxyController_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ -15,9 +16,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/proxy_resolution/proxy_config_service_android.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwProxyController_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::HasException;
 using base::android::JavaParamRef;

android_webview/browser/aw_quota_manager_bridge.cc

@@ -8,6 +8,7 @@
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
+#include "android_webview/browser_jni_headers/AwQuotaManagerBridge_jni.h"
 #include "base/android/callback_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -25,9 +26,6 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwQuotaManagerBridge_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::JavaRef;

android_webview/browser/aw_render_process.cc

@@ -4,6 +4,7 @@
 
 #include "android_webview/browser/aw_render_process.h"
 
+#include "android_webview/browser_jni_headers/AwRenderProcess_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ -11,9 +12,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_channel_proxy.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwRenderProcess_jni.h"
-
 using base::android::AttachCurrentThread;
 using content::BrowserThread;
 using content::ChildProcessTerminationInfo;

android_webview/browser/aw_settings.cc

@@ -15,6 +15,7 @@
 #include "android_webview/browser/aw_dark_mode.h"
 #include "android_webview/browser/aw_user_agent_metadata.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
+#include "android_webview/browser_jni_headers/AwSettings_jni.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/jni_android.h"
@@ -40,9 +41,6 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwSettings_jni.h"
-
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/aw_user_agent_metadata.cc

@@ -6,13 +6,11 @@
 
 #include "android_webview/browser/aw_client_hints_controller_delegate.h"
 #include "android_webview/browser/aw_user_agent_metadata.h"
+#include "android_webview/browser_jni_headers/AwUserAgentMetadata_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwUserAgentMetadata_jni.h"
-
 using base::android::ConvertUTF8ToJavaString;
 using base::android::Java2dStringArrayTo2dStringVector;
 using base::android::ScopedJavaLocalRef;

android_webview/browser/aw_web_contents_delegate.cc

@@ -14,6 +14,7 @@
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/browser/permission/media_access_permission_request.h"
 #include "android_webview/browser/permission/permission_request_handler.h"
+#include "android_webview/browser_jni_headers/AwWebContentsDelegate_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -39,9 +40,6 @@
 #include "third_party/blink/public/common/permissions/permission_utils.h"
 #include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwWebContentsDelegate_jni.h"
-
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;

android_webview/browser/cookie_manager.cc

@@ -15,6 +15,7 @@
 #include "android_webview/browser/aw_browser_context_store.h"
 #include "android_webview/browser/aw_client_hints_controller_delegate.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
+#include "android_webview/browser_jni_headers/AwCookieManager_jni.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/android/build_info.h"
 #include "base/android/callback_android.h"
@@ -56,9 +57,6 @@
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 #include "url/url_constants.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwCookieManager_jni.h"
-
 using base::WaitableEvent;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;

android_webview/browser/gfx/aw_draw_fn_impl.cc

@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "android_webview/browser/gfx/aw_vulkan_context_provider.h"
+#include "android_webview/browser_jni_headers/AwDrawFnImpl_jni.h"
 #include "base/android/build_info.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
@@ -19,9 +20,6 @@
 #include "third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h"
 #include "ui/gfx/color_space.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwDrawFnImpl_jni.h"
-
 using base::android::JavaParamRef;
 using content::BrowserThread;
 

android_webview/browser/gfx/aw_gl_functor.cc

@@ -4,14 +4,12 @@
 
 #include "android_webview/browser/gfx/aw_gl_functor.h"
 
+#include "android_webview/browser_jni_headers/AwGLFunctor_jni.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwGLFunctor_jni.h"
-
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;

android_webview/browser/gfx/aw_picture.cc

@@ -5,13 +5,11 @@
 #include "android_webview/browser/gfx/aw_picture.h"
 
 #include "android_webview/browser/gfx/java_browser_view_renderer_helper.h"
+#include "android_webview/browser_jni_headers/AwPicture_jni.h"
 #include "base/check.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwPicture_jni.h"
-
 using base::android::JavaParamRef;
 
 namespace android_webview {

android_webview/browser/gfx/begin_frame_source_webview.cc

@@ -4,14 +4,12 @@
 
 #include "android_webview/browser/gfx/begin_frame_source_webview.h"
 
+#include "android_webview/browser_jni_headers/RootBeginFrameSourceWebView_jni.h"
 #include "base/auto_reset.h"
 #include "base/memory/raw_ptr.h"
 #include "base/no_destructor.h"
 #include "base/trace_event/trace_event.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/RootBeginFrameSourceWebView_jni.h"
-
 namespace android_webview {
 
 class BeginFrameSourceWebView::BeginFrameObserver

android_webview/browser/gfx/java_browser_view_renderer_helper.cc

@@ -7,6 +7,7 @@
 #include <android/bitmap.h>
 #include <memory>
 
+#include "android_webview/browser_jni_headers/JavaBrowserViewRendererHelper_jni.h"
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
@@ -17,9 +18,6 @@
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/utils/SkCanvasStateUtils.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/JavaBrowserViewRendererHelper_jni.h"
-
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {

android_webview/browser/js_java_interaction/aw_web_message_host_factory.cc

@@ -7,6 +7,8 @@
 #include <string>
 
 #include "android_webview/browser/js_java_interaction/js_reply_proxy.h"
+#include "android_webview/browser_jni_headers/WebMessageListenerHolder_jni.h"
+#include "android_webview/browser_jni_headers/WebMessageListenerInfo_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -17,10 +19,6 @@
 #include "content/public/browser/android/message_payload.h"
 #include "content/public/browser/android/message_port_helper.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/WebMessageListenerHolder_jni.h"
-#include "android_webview/browser_jni_headers/WebMessageListenerInfo_jni.h"
-
 namespace android_webview {
 namespace {
 

android_webview/browser/js_java_interaction/js_reply_proxy.cc

@@ -6,13 +6,11 @@
 
 #include <utility>
 
+#include "android_webview/browser_jni_headers/JsReplyProxy_jni.h"
 #include "base/android/jni_string.h"
 #include "components/js_injection/browser/web_message_reply_proxy.h"
 #include "content/public/browser/android/message_payload.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/JsReplyProxy_jni.h"
-
 namespace android_webview {
 
 JsReplyProxy::JsReplyProxy(js_injection::WebMessageReplyProxy* reply_proxy)

android_webview/browser/lifecycle/aw_contents_lifecycle_notifier.cc

@@ -6,12 +6,10 @@
 
 #include <utility>
 
+#include "android_webview/browser_jni_headers/AwContentsLifecycleNotifier_jni.h"
 #include "base/containers/contains.h"
 #include "content/public/browser/browser_thread.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwContentsLifecycleNotifier_jni.h"
-
 using base::android::AttachCurrentThread;
 using content::BrowserThread;
 

android_webview/browser/metrics/aw_metrics_service_client.cc

@@ -8,6 +8,7 @@
 #include <cstdint>
 
 #include "android_webview/browser/metrics/android_metrics_provider.h"
+#include "android_webview/browser_jni_headers/AwMetricsServiceClient_jni.h"
 #include "android_webview/common/aw_features.h"
 #include "base/android/callback_android.h"
 #include "base/android/jni_android.h"
@@ -27,9 +28,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/version_info/android/channel_getter.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwMetricsServiceClient_jni.h"
-
 namespace android_webview {
 
 namespace prefs {

android_webview/browser/metrics/multiple_user_profiles_state_util.cc

@@ -4,7 +4,6 @@
 
 #include "android_webview/browser/metrics/system_state_util.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/SystemStateUtil_jni.h"
 
 namespace android_webview {

android_webview/browser/metrics/system_state_util.cc

@@ -4,7 +4,6 @@
 
 #include "android_webview/browser/metrics/system_state_util.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/SystemStateUtil_jni.h"
 
 namespace android_webview {

android_webview/browser/network_service/aw_web_resource_intercept_response.cc

@@ -7,12 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include "android_webview/browser_jni_headers/AwWebResourceInterceptResponse_jni.h"
 #include "base/android/jni_android.h"
 #include "components/embedder_support/android/util/web_resource_response.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwWebResourceInterceptResponse_jni.h"
-
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {

android_webview/browser/permission/aw_permission_request.cc

@@ -7,10 +7,8 @@
 #include <utility>
 
 #include "android_webview/browser/permission/aw_permission_request_delegate.h"
-#include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/AwPermissionRequest_jni.h"
+#include "base/android/jni_string.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;

android_webview/browser/popup_touch_handle_drawable.cc

@@ -4,7 +4,6 @@
 
 #include "android_webview/browser/popup_touch_handle_drawable.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/PopupTouchHandleDrawable_jni.h"
 
 using base::android::JavaParamRef;

android_webview/browser/safe_browsing/aw_url_checker_delegate_impl.cc

@@ -16,6 +16,8 @@
 #include "android_webview/browser/network_service/aw_web_resource_request.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager.h"
 #include "android_webview/browser/safe_browsing/aw_safe_browsing_ui_manager.h"
+#include "android_webview/browser_jni_headers/AwSafeBrowsingConfigHelper_jni.h"
+#include "android_webview/browser_jni_headers/AwSafeBrowsingSafeModeAction_jni.h"
 #include "base/android/jni_android.h"
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
@@ -35,10 +37,6 @@
 #include "content/public/common/url_constants.h"
 #include "ui/base/page_transition_types.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/AwSafeBrowsingConfigHelper_jni.h"
-#include "android_webview/browser_jni_headers/AwSafeBrowsingSafeModeAction_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/browser/supervised_user/aw_supervised_user_url_classifier.cc

@@ -9,10 +9,8 @@
 #include "base/android/scoped_java_ref.h"
 #include "url/android/gurl_android.h"
 
-#include "content/public/browser/browser_thread.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/AwSupervisedUserUrlClassifier_jni.h"
+#include "content/public/browser/browser_thread.h"
 
 using base::android::AttachCurrentThread;
 

android_webview/browser/tracing/aw_tracing_controller.cc

@@ -14,7 +14,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/tracing_controller.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "android_webview/browser_jni_headers/AwTracingController_jni.h"
 
 using base::android::JavaParamRef;

android_webview/browser/variations/variations_seed_loader.cc

@@ -10,6 +10,7 @@
 
 #include "android_webview/browser/variations/variations_seed_loader.h"
 
+#include "android_webview/browser_jni_headers/VariationsSeedLoader_jni.h"
 #include "android_webview/proto/aw_variations_seed.pb.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
@@ -18,9 +19,6 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/browser_jni_headers/VariationsSeedLoader_jni.h"
-
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;

android_webview/common/aw_content_client.cc

@@ -10,6 +10,7 @@
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
 #include "android_webview/common/url_constants.h"
+#include "android_webview/common_jni/DisableOriginTrialsSafeModeUtils_jni.h"
 #include "base/android/jni_android.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
@@ -30,9 +31,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/common_jni/DisableOriginTrialsSafeModeUtils_jni.h"
-
 namespace android_webview {
 
 AwContentClient::AwContentClient() = default;

android_webview/common/aw_resource.cc

@@ -4,13 +4,11 @@
 
 #include "android_webview/common/aw_resource.h"
 
+#include "android_webview/common_jni/AwResource_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/common_jni/AwResource_jni.h"
-
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {

android_webview/common/crash_reporter/aw_crash_reporter_client.cc

@@ -10,6 +10,7 @@
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
+#include "android_webview/crash_client_jni/AwCrashReporterClient_jni.h"
 #include "base/android/build_info.h"
 #include "base/android/java_exception_reporter.h"
 #include "base/android/jni_android.h"
@@ -28,9 +29,6 @@
 #include "components/version_info/version_info.h"
 #include "components/version_info/version_info_values.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/crash_client_jni/AwCrashReporterClient_jni.h"
-
 using base::android::AttachCurrentThread;
 
 namespace android_webview {

android_webview/js_sandbox/service/js_sandbox_isolate.cc

@@ -14,6 +14,7 @@
 #include <string>
 #include <string_view>
 
+#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolate_jni.h"
 #include "android_webview/js_sandbox/service/js_sandbox_array_buffer_allocator.h"
 #include "android_webview/js_sandbox/service/js_sandbox_isolate_callback.h"
 #include "base/android/callback_android.h"
@@ -56,9 +57,6 @@
 #include "v8/include/v8-statistics.h"
 #include "v8/include/v8-template.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolate_jni.h"
-
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;

android_webview/js_sandbox/service/js_sandbox_isolate_callback.cc

@@ -7,15 +7,13 @@
 #include <jni.h>
 #include <sstream>
 
+#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolateCallback_jni.h"
+#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolateFdCallback_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/files/file_util.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolateCallback_jni.h"
-#include "android_webview/js_sandbox/js_sandbox_jni_headers/JsSandboxIsolateFdCallback_jni.h"
-
 namespace android_webview {
 
 JsSandboxIsolateCallback::JsSandboxIsolateCallback(

android_webview/nonembedded/component_updater/aw_component_installer_policy.cc

@@ -12,6 +12,7 @@
 
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/nonembedded/component_updater/aw_component_update_service.h"
+#include "android_webview/nonembedded/nonembedded_jni_headers/ComponentsProviderPathUtil_jni.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
@@ -25,9 +26,6 @@
 #include "base/version.h"
 #include "components/update_client/utils.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/nonembedded/nonembedded_jni_headers/ComponentsProviderPathUtil_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/nonembedded/component_updater/aw_component_update_service.cc

@@ -11,6 +11,7 @@
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/nonembedded/component_updater/aw_component_updater_configurator.h"
 #include "android_webview/nonembedded/component_updater/registration.h"
+#include "android_webview/nonembedded/nonembedded_jni_headers/AwComponentUpdateService_jni.h"
 #include "android_webview/nonembedded/webview_apk_process.h"
 #include "base/android/callback_android.h"
 #include "base/android/scoped_java_ref.h"
@@ -27,9 +28,6 @@
 #include "components/update_client/crx_update_item.h"
 #include "components/update_client/update_client.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/nonembedded/nonembedded_jni_headers/AwComponentUpdateService_jni.h"
-
 namespace android_webview {
 
 // static

android_webview/nonembedded/net/network_fetcher_task.cc

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "android_webview/nonembedded/net/network_impl.h"
+#include "android_webview/nonembedded/nonembedded_jni_headers/NetworkFetcherTask_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/check.h"
@@ -24,9 +25,6 @@
 #include "url/android/gurl_android.h"
 #include "url/gurl.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/nonembedded/nonembedded_jni_headers/NetworkFetcherTask_jni.h"
-
 namespace android_webview {
 
 namespace {

android_webview/nonembedded/webview_apk_application.cc

@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "android_webview/nonembedded/nonembedded_jni_headers/WebViewApkApplication_jni.h"
 
 #include "android_webview/common/aw_resource_bundle.h"
 #include "android_webview/nonembedded/webview_apk_process.h"
 #include "base/android/base_jni_onload.h"
 #include "base/check.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/nonembedded/nonembedded_jni_headers/WebViewApkApplication_jni.h"
-
 namespace android_webview {
 
 void JNI_WebViewApkApplication_InitializeGlobalsAndResources(JNIEnv* env) {

android_webview/test/browser/disable_origin_trials_safemode_test_utils.cc

@@ -1,12 +1,10 @@
 // Copyright 2023 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+#include "android_webview/test/webview_instrumentation_test_native_jni/DisableOriginTrialsSafeModeTestUtils_jni.h"
 #include "components/embedder_support/origin_trials/origin_trial_policy_impl.h"
 #include "content/public/common/content_client.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/webview_instrumentation_test_native_jni/DisableOriginTrialsSafeModeTestUtils_jni.h"
-
 namespace android_webview {
 
 static jboolean

android_webview/test/browser/embedded_component_loader_test_helper.cc

@@ -9,6 +9,8 @@
 #include <utility>
 #include <vector>
 
+#include "android_webview/test/webview_instrumentation_test_jni/EmbeddedComponentLoaderTest_jni.h"
+#include "android_webview/test/webview_instrumentation_test_native_jni/EmbeddedComponentLoaderFactory_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -19,10 +21,6 @@
 #include "base/version.h"
 #include "components/component_updater/android/component_loader_policy.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/webview_instrumentation_test_jni/EmbeddedComponentLoaderTest_jni.h"
-#include "android_webview/test/webview_instrumentation_test_native_jni/EmbeddedComponentLoaderFactory_jni.h"
-
 namespace component_updater {
 
 namespace {

android_webview/test/browser/renderer_process_metrics_provider_utils.cc

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "android_webview/test/webview_instrumentation_test_native_jni/RendererProcessMetricsProviderUtils_jni.h"
 
 #include "android_webview/browser/metrics/renderer_process_metrics_provider.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/webview_instrumentation_test_native_jni/RendererProcessMetricsProviderUtils_jni.h"
-
 namespace android_webview {
 
 // static

android_webview/test/browser/variations_test_utils.cc

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "android_webview/test/webview_instrumentation_test_native_jni/VariationsTestUtils_jni.h"
 
 #include "android_webview/browser/aw_feature_list_creator.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/webview_instrumentation_test_native_jni/VariationsTestUtils_jni.h"
-
 namespace android_webview {
 
 void JNI_VariationsTestUtils_DisableSignatureVerificationForTesting(

android_webview/test/embedded_test_server/aw_embedded_test_server.cc

@@ -6,6 +6,7 @@
 
 #include <string_view>
 
+#include "android_webview/test/embedded_test_server/aw_net_jni_headers/AwEmbeddedTestServerImpl_jni.h"
 #include "base/android/jni_array.h"
 #include "base/base64.h"
 #include "base/strings/stringprintf.h"
@@ -14,9 +15,6 @@
 #include "net/test/embedded_test_server/request_handler_util.h"
 #include "services/network/public/cpp/client_hints.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/embedded_test_server/aw_net_jni_headers/AwEmbeddedTestServerImpl_jni.h"
-
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;

android_webview/test/shell/memory_metrics_logger_utils.cc

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "android_webview/test/webview_instrumentation_test_native_jni/MemoryMetricsLoggerUtils_jni.h"
 
 #include "base/run_loop.h"
 #include "base/test/bind.h"
@@ -9,9 +10,6 @@
 #include "base/test/test_timeouts.h"
 #include "components/embedder_support/android/metrics/memory_metrics_logger.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/webview_instrumentation_test_native_jni/MemoryMetricsLoggerUtils_jni.h"
-
 namespace android_webview {
 
 // static

android_webview/test/shell/src/draw_fn/context_manager.cc

@@ -8,6 +8,7 @@
 #include <GLES2/gl2.h>
 
 #include "android_webview/public/browser/draw_fn.h"
+#include "android_webview/test/draw_fn_impl_jni_headers/ContextManager_jni.h"
 #include "android_webview/test/shell/src/draw_fn/allocator.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
@@ -44,9 +45,6 @@
 #include "third_party/skia/include/gpu/vk/VulkanMutableTextureState.h"
 #include "ui/gfx/color_space.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "android_webview/test/draw_fn_impl_jni_headers/ContextManager_jni.h"
-
 namespace draw_fn {
 
 namespace {

base/android/apk_assets.cc

@@ -9,13 +9,11 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/base_jni/ApkAssets_jni.h"
 #include "base/debug/crash_logging.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/file_descriptor_store.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/ApkAssets_jni.h"
-
 namespace base {
 namespace android {
 

base/android/application_status_listener.cc

@@ -10,15 +10,13 @@
 #include "base/lazy_instance.h"
 #include "base/metrics/user_metrics.h"
 #include "base/observer_list_threadsafe.h"
+#include "base/tasks_jni/ApplicationStatus_jni.h"
 #include "base/trace_event/base_tracing.h"
 
 #if BUILDFLAG(ENABLE_BASE_TRACING)
 #include "base/trace_event/application_state_proto_android.h"  // no-presubmit-check
 #endif  // BUILDFLAG(ENABLE_BASE_TRACING)
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/tasks_jni/ApplicationStatus_jni.h"
-
 namespace base {
 namespace android {
 

base/android/build_info.cc

@@ -9,14 +9,12 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/base_jni/BuildInfo_jni.h"
 #include "base/check_op.h"
 #include "base/memory/singleton.h"
 #include "base/notreached.h"
 #include "base/strings/string_number_conversions.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/BuildInfo_jni.h"
-
 namespace base {
 namespace android {
 

base/android/child_process_service.cc

@@ -11,8 +11,6 @@
 #include "base/file_descriptor_store.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/process_launcher_jni/ChildProcessService_jni.h"
 
 using base::android::JavaIntArrayToIntVector;

base/android/content_uri_utils.cc

@@ -6,8 +6,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/ContentUriUtils_jni.h"
 
 using base::android::ConvertUTF8ToJavaString;

base/android/cpu_features.cc

@@ -5,8 +5,6 @@
 #include <cpu-features.h>
 
 #include "base/android/jni_android.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/CpuFeatures_jni.h"
 
 namespace base {

base/android/early_trace_event_binding.cc

@@ -8,13 +8,11 @@
 
 #include "base/android/jni_string.h"
 #include "base/android/trace_event_binding.h"
+#include "base/tasks_jni/EarlyTraceEvent_jni.h"
 #include "base/time/time.h"
 #include "base/trace_event/base_tracing.h"
 #include "base/tracing_buildflags.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/tasks_jni/EarlyTraceEvent_jni.h"
-
 namespace base {
 namespace android {
 

base/android/event_log.cc

@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/android/event_log.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/EventLog_jni.h"
 
 namespace base {

base/android/feature_list_jni.cc

@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/feature_list.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/FeatureList_jni.h"
+#include "base/feature_list.h"
 
 namespace base {
 namespace android {

base/android/input_hint_checker.cc

@@ -4,14 +4,12 @@
 
 #include "base/android/input_hint_checker.h"
 
+#include "base/base_jni/InputHintChecker_jni.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/no_destructor.h"
 #include "base/time/time.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/InputHintChecker_jni.h"
-
 namespace base::android {
 
 namespace {

base/android/int_string_callback.cc

@@ -11,8 +11,6 @@
 #include <jni.h>
 
 #include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/IntStringCallback_jni.h"
 
 namespace base {

base/android/jank_metric_uma_recorder.cc

@@ -8,15 +8,13 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
+#include "base/jank_tracker_jni/JankMetricUMARecorder_jni.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/notreached.h"
 #include "base/time/time.h"
 #include "base/trace_event/base_tracing.h"
 #include "jank_metric_uma_recorder.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/jank_tracker_jni/JankMetricUMARecorder_jni.h"
-
 namespace base::android {
 
 namespace {

base/android/java_heap_dump_generator.cc

@@ -9,8 +9,6 @@
 #include <string_view>
 
 #include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/memory_jni/JavaHeapDumpGenerator_jni.h"
 
 namespace base {

base/android/java_runtime.cc

@@ -4,10 +4,8 @@
 
 #include "base/android/java_runtime.h"
 
-#include "base/numerics/safe_conversions.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/android_runtime_jni_headers/Runtime_jni.h"
+#include "base/numerics/safe_conversions.h"
 
 namespace base {
 namespace android {

base/android/jni_android_unittest.cc

@@ -9,6 +9,7 @@
 
 #include "base/android/java_exception_reporter.h"
 #include "base/at_exit.h"
+#include "base/base_unittest_support_jni/JniAndroidTestUtils_jni.h"
 #include "base/functional/bind.h"
 #include "base/logging.h"
 #include "base/memory/raw_ptr.h"
@@ -18,9 +19,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_unittest_support_jni/JniAndroidTestUtils_jni.h"
-
 using ::testing::Eq;
 using ::testing::Optional;
 using ::testing::StartsWith;

base/android/library_loader/library_prefetcher_hooks.cc

@@ -10,10 +10,8 @@
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/library_loader/library_prefetcher.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/logging.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/library_loader_jni/LibraryPrefetcher_jni.h"
+#include "base/logging.h"
 
 namespace base {
 namespace android {

base/android/linker/linker_jni.cc

@@ -7,6 +7,7 @@
 #pragma allow_unsafe_buffers
 #endif
 
+#include "base/android/linker/linker_jni.h"
 
 #include <android/dlext.h>
 #include <dlfcn.h>
@@ -23,9 +24,6 @@
 
 #include <memory>
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/android/linker/linker_jni.h"
-
 namespace chromium_android_linker {
 
 namespace {

base/android/linker/linker_jni_onload.cc

@@ -9,7 +9,6 @@
 
 #include <jni.h>
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/android/linker/linker_jni.h"
 
 namespace chromium_android_linker {

base/android/linker/linker_unittest.cc

@@ -12,14 +12,12 @@
 #include <sys/prctl.h>
 #include <sys/utsname.h>
 
+#include "base/android/linker/linker_jni.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/system/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/android/linker/linker_jni.h"
-
 extern char __executable_start;
 
 extern "C" {

base/android/locale_utils.cc

@@ -6,8 +6,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/LocaleUtils_jni.h"
 
 namespace base {

base/android/memory_pressure_listener_android.cc

@@ -6,8 +6,6 @@
 
 #include "base/android/pre_freeze_background_memory_trimmer.h"
 #include "base/memory/memory_pressure_listener.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/memory_jni/MemoryPressureListener_jni.h"
 
 using base::android::JavaParamRef;

base/android/memory_purge_manager_android.cc

@@ -7,10 +7,8 @@
 #include "base/android/build_info.h"
 #include "base/android/pre_freeze_background_memory_trimmer.h"
 #include "base/functional/bind.h"
-#include "third_party/jni_zero/jni_zero.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/memory_jni/MemoryPurgeManager_jni.h"
+#include "third_party/jni_zero/jni_zero.h"
 
 static void JNI_MemoryPurgeManager_PostDelayedPurgeTaskOnUiThread(JNIEnv* env,
                                                                   jlong delay) {

base/android/path_utils.cc

@@ -10,7 +10,6 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/files/file_path.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/PathUtils_jni.h"
 
 namespace base {

base/android/radio_utils.cc

@@ -6,7 +6,6 @@
 
 #include <optional>
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/RadioUtils_jni.h"
 
 namespace base {

base/android/shared_preferences/shared_preferences_manager.cc

@@ -6,10 +6,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "base/check.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_shared_preferences_jni/SharedPreferencesManager_jni.h"
+#include "base/check.h"
 
 namespace base::android {
 

base/android/sys_utils.cc

@@ -8,12 +8,10 @@
 
 #include "base/android/build_info.h"
 #include "base/process/process_metrics.h"
+#include "base/sys_utils_jni/SysUtils_jni.h"
 #include "base/system/sys_info.h"
 #include "base/trace_event/base_tracing.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/sys_utils_jni/SysUtils_jni.h"
-
 namespace base {
 namespace android {
 

base/android/task_scheduler/post_task_android.cc

@@ -4,7 +4,6 @@
 
 #include "base/android/task_scheduler/post_task_android.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/tasks_jni/PostTask_jni.h"
 
 namespace base {

base/android/timezone_utils.cc

@@ -8,8 +8,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_jni/TimezoneUtils_jni.h"
 
 namespace base {

base/power_monitor/power_monitor_device_source_android.cc

@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/base_jni/PowerMonitor_jni.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/power_monitor/power_monitor_source.h"
 #include "base/power_monitor/power_observer.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_jni/PowerMonitor_jni.h"
-
 namespace base {
 
 // A helper function which is a friend of PowerMonitorSource.

base/profiler/stack_sampling_profiler_java_test_util.cc

@@ -4,10 +4,8 @@
 
 #include "base/profiler/stack_sampling_profiler_java_test_util.h"
 
-#include "base/location.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/base_profiler_test_support_jni/TestSupport_jni.h"
+#include "base/location.h"
 
 namespace base {
 

base/test/android/java_handler_thread_helpers.cc

@@ -7,8 +7,6 @@
 #include "base/android/java_handler_thread.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/current_thread.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/test/base_unittests_jni_headers/JavaHandlerThreadHelpers_jni.h"
 
 namespace base {

base/test/android/url_utils.cc

@@ -6,8 +6,6 @@
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/test/test_support_jni_headers/UrlUtils_jni.h"
 
 namespace base {

base/test/library_loader/early_native_test_helper.cc

@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/base_javatests_jni/EarlyNativeTest_jni.h"
 #include "base/command_line.h"
 #include "base/process/current_process.h"
 #include "base/trace_event/trace_log.h"
 #include "base/tracing_buildflags.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/base_javatests_jni/EarlyNativeTest_jni.h"
-
 namespace base {
 
 // Ensures that the LibraryLoader swapped over to the native command line.

base/test/multiprocess_test_android.cc

@@ -13,8 +13,6 @@
 #include "base/base_switches.h"
 #include "base/check.h"
 #include "base/command_line.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/test/test_support_jni_headers/MainReturnCodeResult_jni.h"
 #include "base/test/test_support_jni_headers/MultiprocessTestClientLauncher_jni.h"
 

base/test/test_file_util_android.cc

@@ -7,8 +7,6 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/test/base_unittests_jni_headers/ContentUriTestUtils_jni.h"
 
 using base::android::ScopedJavaLocalRef;

base/test/thread_pool_test_helpers_android.cc

@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/task/thread_pool/thread_pool_instance.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/test/test_support_jni_headers/ThreadPoolTestHelpers_jni.h"
 
 namespace base {

base/threading/platform_thread_android.cc

@@ -15,12 +15,10 @@
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/tasks_jni/ThreadUtils_jni.h"
 #include "base/threading/platform_thread_internal_posix.h"
 #include "base/threading/thread_id_name_manager.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
-#include "base/tasks_jni/ThreadUtils_jni.h"
-
 namespace base {
 
 namespace internal {

base/version_info/android/channel_getter.cc

@@ -4,7 +4,6 @@
 
 #include "base/version_info/android/channel_getter.h"
 
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "base/version_info/android/version_constants_bridge_jni/VersionConstantsBridge_jni.h"
 
 namespace version_info {

chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc

@@ -31,8 +31,6 @@
 // These "headers" actually contain several function definitions and thus can
 // only be included once across Chromium.
 #include "base/time/time.h"
-
-// Must come after all headers that specialize FromJniType() / ToJniType().
 #include "chrome/android/features/cablev2_authenticator/jni_headers/BLEAdvert_jni.h"
 #include "chrome/android/features/cablev2_authenticator/jni_headers/CableAuthenticator_jni.h"
 #include "chrome/android/features/cablev2_authenticator/jni_headers/USBHandler_jni.h"