jni_zero: Preparing for jni_zero to no longer depend on base

Soon, jni_zero's generated files will no longer have a dep onto base's
jni_android.h, which will break a number of files which rely on that
include to provide the base:: aliases to jni_zero functions. For the
most part, I have just changed the base::android:: refs to jni_zero::,
and in a few files with different references I've just added a direct
include of jni_android.h (or whatever header file was needed).

Bug: 1377351
Change-Id: I1a635d950be3e60f2afa400e52fe33fa9e433002
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5240489
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Sam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1252790}

android_webview/browser/gfx/aw_gl_functor.cc

@@ -10,10 +10,10 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
+using jni_zero::AttachCurrentThread;
 
 extern "C" {
 static AwDrawGLFunction DrawGLFunction;

android_webview/browser/gfx/aw_picture.cc

@@ -6,6 +6,7 @@
 
 #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"
 

android_webview/browser/gfx/begin_frame_source_webview.cc

@@ -125,7 +125,7 @@ RootBeginFrameSourceWebView::RootBeginFrameSourceWebView()
                           60.0f,
                           /*requires_align_with_java=*/true),
       j_object_(Java_RootBeginFrameSourceWebView_Constructor(
-          base::android::AttachCurrentThread(),
+          jni_zero::AttachCurrentThread(),
           reinterpret_cast<jlong>(this))) {
   ObserveBeginFrameSource(&begin_frame_source_);
 }

android_webview/browser/gfx/java_browser_view_renderer_helper.cc

@@ -136,7 +136,7 @@ AuxiliaryCanvasHolder::AuxiliaryCanvasHolder(
 AuxiliaryCanvasHolder::~AuxiliaryCanvasHolder() {
   bitmap_.reset();
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (AndroidBitmap_unlockPixels(env, jbitmap_.obj()) < 0) {
     LOG(ERROR) << "Error unlocking java bitmap pixels.";
     return;
@@ -162,7 +162,7 @@ std::unique_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create(
     const gfx::Point& scroll_correction,
     const gfx::Size& auxiliary_bitmap_size,
     bool force_auxiliary_bitmap) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   std::unique_ptr<SoftwareCanvasHolder> holder;
   if (!force_auxiliary_bitmap) {
     holder =

android_webview/browser/metrics/system_state_util.cc

@@ -12,7 +12,7 @@ MultipleUserProfilesState GetMultipleUserProfilesState() {
   static MultipleUserProfilesState multiple_user_profiles_state =
       static_cast<MultipleUserProfilesState>(
           Java_SystemStateUtil_getMultipleUserProfilesState(
-              base::android::AttachCurrentThread()));
+              jni_zero::AttachCurrentThread()));
   return multiple_user_profiles_state;
 }
 
@@ -20,7 +20,7 @@ PrimaryCpuAbiBitness GetPrimaryCpuAbiBitness() {
   static PrimaryCpuAbiBitness primary_cpu_abi_bitness =
       static_cast<PrimaryCpuAbiBitness>(
           Java_SystemStateUtil_getPrimaryCpuAbiBitness(
-              base::android::AttachCurrentThread()));
+              jni_zero::AttachCurrentThread()));
   return primary_cpu_abi_bitness;
 }
 

android_webview/browser/permission/aw_permission_request.cc

@@ -10,10 +10,10 @@
 #include "android_webview/browser_jni_headers/AwPermissionRequest_jni.h"
 #include "base/android/jni_string.h"
 
-using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace android_webview {
 

android_webview/browser/popup_touch_handle_drawable.cc

@@ -21,14 +21,14 @@ PopupTouchHandleDrawable::PopupTouchHandleDrawable(
 }
 
 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj)
     Java_PopupTouchHandleDrawable_destroy(env, obj);
 }
 
 void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj)
     return;
@@ -42,7 +42,7 @@ void PopupTouchHandleDrawable::SetOrientation(
     ui::TouchHandleOrientation orientation,
     bool mirror_vertical,
     bool mirror_horizontal) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj) {
     Java_PopupTouchHandleDrawable_setOrientation(
@@ -52,7 +52,7 @@ void PopupTouchHandleDrawable::SetOrientation(
 }
 
 void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj) {
     Java_PopupTouchHandleDrawable_setOrigin(env, obj, origin.x(), origin.y());
@@ -60,7 +60,7 @@ void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
 }
 
 void PopupTouchHandleDrawable::SetAlpha(float alpha) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   bool visible = alpha > 0;
   if (obj)
@@ -68,7 +68,7 @@ void PopupTouchHandleDrawable::SetAlpha(float alpha) {
 }
 
 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj)
     return gfx::RectF();

android_webview/browser/variations/variations_seed_loader.cc

@@ -118,7 +118,7 @@ std::unique_ptr<AwVariationsSeed> TakeSeed() {
 }
 
 void CacheSeedFreshness(long freshness) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_VariationsSeedLoader_cacheSeedFreshness(env, freshness);
 }
 

android_webview/common/aw_resource.cc

@@ -15,7 +15,7 @@ namespace android_webview {
 namespace AwResource {
 
 std::vector<std::string> GetConfigKeySystemUuidMapping() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   std::vector<std::string> key_system_uuid_mappings;
   ScopedJavaLocalRef<jobjectArray> mappings =
       Java_AwResource_getConfigKeySystemUuidMapping(env);

android_webview/nonembedded/component_updater/aw_component_installer_policy.cc

@@ -77,7 +77,7 @@ void AwComponentInstallerPolicy::ComponentReady(
   base::FilePath cps_component_base_path =
       GetComponentsProviderServiceDirectory();
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   int highest_sequence_number =
       Java_ComponentsProviderPathUtil_getTheHighestSequenceNumber(
           env, base::android::ConvertUTF8ToJavaString(
@@ -138,7 +138,7 @@ AwComponentInstallerPolicy::GetComponentsProviderServiceDirectory() {
   GetHash(&hash);
   std::string component_id = update_client::GetCrxIdFromPublicKeyHash(hash);
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::FilePath(
              base::android::ConvertJavaStringToUTF8(
                  env,

android_webview/nonembedded/net/network_fetcher_task.cc

@@ -37,7 +37,7 @@ void InvokePostRequest(
     const std::string& post_data,
     const std::string& content_type,
     const base::flat_map<std::string, std::string>& post_additional_headers) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
 
   std::vector<std::string> keys, values;
   for (auto const& header : post_additional_headers) {
@@ -59,7 +59,7 @@ void InvokeDownload(TaskWeakPtr weak_ptr,
                     scoped_refptr<base::SequencedTaskRunner> task_runner,
                     const GURL& url,
                     const base::FilePath& file_path) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_NetworkFetcherTask_download(
       env, reinterpret_cast<intptr_t>(&weak_ptr),
       reinterpret_cast<intptr_t>(task_runner.get()),

base/android/callback_android.cc

@@ -4,6 +4,7 @@
 
 #include "base/android/callback_android.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"

base/android/early_trace_event_binding.cc

@@ -120,13 +120,13 @@ static void JNI_EarlyTraceEvent_RecordEarlyAsyncEndEvent(JNIEnv* env,
 }
 
 bool GetBackgroundStartupTracingFlag() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::android::Java_EarlyTraceEvent_getBackgroundStartupTracingFlag(
       env);
 }
 
 void SetBackgroundStartupTracingFlag(bool enabled) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::Java_EarlyTraceEvent_setBackgroundStartupTracingFlag(env,
                                                                       enabled);
 }

base/android/event_log.cc

@@ -9,7 +9,7 @@ namespace base {
 namespace android {
 
 void EventLogWriteInt(int tag, int value) {
-  Java_EventLog_writeEvent(AttachCurrentThread(), tag, value);
+  Java_EventLog_writeEvent(jni_zero::AttachCurrentThread(), tag, value);
 }
 
 }  // namespace android

base/android/int_string_callback.cc

@@ -19,7 +19,7 @@ namespace android {
 void RunIntStringCallbackAndroid(const JavaRef<jobject>& callback,
                                  int int_arg,
                                  const std::string& str_arg) {
-  JNIEnv* env = AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_IntStringCallback_onResult(env, callback, int_arg,
                                   ConvertUTF8ToJavaString(env, str_arg));
 }

base/android/java_heap_dump_generator.cc

@@ -13,7 +13,7 @@ namespace base {
 namespace android {
 
 bool WriteJavaHeapDumpToPath(base::StringPiece filePath) {
-  JNIEnv* env = AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return Java_JavaHeapDumpGenerator_generateHprof(
       env, base::android::ConvertUTF8ToJavaString(env, filePath));
 }

base/android/java_runtime.cc

@@ -12,7 +12,7 @@ namespace android {
 
 void JavaRuntime::GetMemoryUsage(uint64_t* total_memory,
                                  uint64_t* free_memory) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> runtime =
       JNI_Runtime::Java_Runtime_getRuntime(env);
   *total_memory = checked_cast<uint64_t>(

base/android/task_scheduler/post_task_android.cc

@@ -10,7 +10,7 @@ namespace base {
 
 // static
 void PostTaskAndroid::SignalNativeSchedulerReady() {
-  Java_PostTask_onNativeSchedulerReady(base::android::AttachCurrentThread());
+  Java_PostTask_onNativeSchedulerReady(jni_zero::AttachCurrentThread());
 }
 
 }  // namespace base

base/android/task_scheduler/task_runner_android.cc

@@ -41,7 +41,7 @@ void RunJavaTask(base::android::ScopedJavaGlobalRef<jobject> task,
         base::StrCat({"JniPostTask: ", runnable_class_name});
     ctx.event()->set_name(event_name.c_str());
   });
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   JNI_Runnable::Java_Runnable_run(env, task);
 }
 

base/android/trace_event_binding.cc

@@ -47,7 +47,7 @@ class TraceEnabledObserver : public perfetto::TrackEventSessionObserver {
   }
 
   void OnStart(const perfetto::DataSourceBase::StartArgs&) override {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     base::android::Java_TraceEvent_setEnabled(env, true);
     base::android::Java_TraceEvent_setEventNameFilteringEnabled(
         env, EventNameFilteringEnabled());
@@ -56,7 +56,7 @@ class TraceEnabledObserver : public perfetto::TrackEventSessionObserver {
   void OnStop(const perfetto::DataSourceBase::StopArgs& args) override {
     event_name_filtering_per_session_.erase(args.internal_instance_index);
 
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     base::android::Java_TraceEvent_setEnabled(
         env, !event_name_filtering_per_session_.empty());
     base::android::Java_TraceEvent_setEventNameFilteringEnabled(
@@ -92,7 +92,7 @@ class TraceEnabledObserver
 
   // trace_event::TraceLog::EnabledStateObserver:
   void OnTraceLogEnabled() override {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     base::android::Java_TraceEvent_setEnabled(env, true);
     if (base::trace_event::TraceLog::GetInstance()
             ->GetCurrentTraceConfig()
@@ -102,7 +102,7 @@ class TraceEnabledObserver
   }
 
   void OnTraceLogDisabled() override {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     base::android::Java_TraceEvent_setEnabled(env, false);
     base::android::Java_TraceEvent_setEventNameFilteringEnabled(env, false);
   }

base/power_monitor/power_monitor_device_source_android.cc

@@ -81,18 +81,18 @@ void JNI_PowerMonitor_OnThermalStatusChanged(JNIEnv* env, int thermal_status) {
 }  // namespace android
 
 bool PowerMonitorDeviceSource::IsOnBatteryPower() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::android::Java_PowerMonitor_isBatteryPower(env);
 }
 
 int PowerMonitorDeviceSource::GetRemainingBatteryCapacity() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::android::Java_PowerMonitor_getRemainingBatteryCapacity(env);
 }
 
 PowerThermalObserver::DeviceThermalState
 PowerMonitorDeviceSource::GetCurrentThermalState() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return android::MapToDeviceThermalState(
       android::Java_PowerMonitor_getCurrentThermalStatus(env));
 }

base/version_info/android/channel_getter.cc

@@ -10,7 +10,7 @@ namespace version_info {
 namespace android {
 
 Channel GetChannel() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return static_cast<Channel>(Java_VersionConstantsBridge_getChannel(env));
 }
 

chrome/browser/after_startup_task_utils_android.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/util/jni_headers/AfterStartupTaskUtils_jni.h"
 
-using base::android::JavaParamRef;
+using jni_zero::JavaParamRef;
 
 namespace android {
 

chrome/browser/android/background_task_scheduler/chrome_background_task_factory.cc

@@ -19,7 +19,7 @@
 
 // static
 void ChromeBackgroundTaskFactory::SetAsDefault() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_ChromeBackgroundTaskFactory_setAsDefault(env);
 }
 

chrome/browser/android/background_task_scheduler/proxy_native_task.cc

@@ -27,7 +27,7 @@ static jlong JNI_ProxyNativeTask_Init(JNIEnv* env,
 
   if (!jextras.is_null()) {
     params.extras = base::android::ConvertJavaStringToUTF8(
-        base::android::AttachCurrentThread(), jextras);
+        jni_zero::AttachCurrentThread(), jextras);
   }
 
   background_task::TaskFinishedCallback finish_callback =

chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc

@@ -67,7 +67,7 @@ void BrowsingDataCounterBridge::Destroy(JNIEnv* env,
 
 void BrowsingDataCounterBridge::onCounterFinished(
     std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Profile* profile =
       ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
   ScopedJavaLocalRef<jstring> result_string =

chrome/browser/android/compositor/resources/resource_factory.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/android/compositor/resources/toolbar_resource.h"
 #include "chrome/browser/ui/android/toolbar/jni_headers/ResourceFactory_jni.h"
 
-using base::android::JavaParamRef;
+using jni_zero::JavaParamRef;
 
 namespace android {
 

chrome/browser/android/feedback/screenshot_task.cc

@@ -13,11 +13,11 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/snapshot/snapshot.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 using ui::WindowAndroid;
 
 namespace chrome {

chrome/browser/android/flags/chrome_cached_flags.cc

@@ -15,7 +15,7 @@ using base::android::ScopedJavaLocalRef;
 namespace chrome::android {
 
 bool IsJavaDrivenFeatureEnabled(const base::Feature& feature) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_feature_name(
       ConvertUTF8ToJavaString(env, feature.name));
   return Java_ChromeCachedFlags_isEnabled(env, j_feature_name);

chrome/browser/android/history/history_deletion_bridge.cc

@@ -54,7 +54,7 @@ void HistoryDeletionBridge::OnURLsDeleted(
     history::HistoryService* history_service,
     const history::DeletionInfo& deletion_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   history::DeletionInfo sanitized_info = SanitizeDeletionInfo(deletion_info);
   Java_HistoryDeletionBridge_onURLsDeleted(
       env, jobj_, CreateHistoryDeletionInfo(env, &sanitized_info));

chrome/browser/android/metrics/uma_utils.cc

@@ -11,7 +11,7 @@
 #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
 #include "components/metrics/metrics_reporting_default_state.h"
 
-using base::android::JavaParamRef;
+using jni_zero::JavaParamRef;
 
 class PrefService;
 
@@ -19,13 +19,13 @@ namespace chrome {
 namespace android {
 
 base::TimeTicks GetApplicationStartTime() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::TimeTicks::FromUptimeMillis(
       Java_UmaUtils_getApplicationStartTime(env));
 }
 
 base::TimeTicks GetProcessStartTime() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return base::TimeTicks::FromUptimeMillis(
       Java_UmaUtils_getProcessStartTime(env));
 }

chrome/browser/android/preferences/cookie_controls_service_bridge.cc

@@ -49,7 +49,7 @@ void CookieControlsServiceBridge::SendCookieControlsUIChanges() {
   bool checked = service_->GetToggleCheckedValue();
   CookieControlsEnforcement enforcement =
       service_->GetCookieControlsEnforcement();
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_CookieControlsServiceBridge_sendCookieControlsUIChanges(
       env, jobject_, checked, static_cast<int>(enforcement));
 }

chrome/browser/android/usage_stats/usage_stats_bridge.cc

@@ -21,13 +21,13 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 
 using base::android::AppendJavaStringArrayToStringVector;
-using base::android::AttachCurrentThread;
 using base::android::JavaArrayOfByteArrayToStringVector;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaArrayOfByteArray;
 using base::android::ToJavaArrayOfStrings;
+using jni_zero::AttachCurrentThread;
 
 namespace usage_stats {
 

chrome/browser/battery/battery_saver.cc

@@ -35,7 +35,7 @@ bool IsBatterySaverEnabled() {
     return g_override_battery_saver_mode_for_testing.value();
   }
 #if BUILDFLAG(IS_ANDROID)
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return battery::android::Java_BatterySaverOSSetting_isBatterySaverEnabled(
       env);
 #else

chrome/browser/commerce/price_tracking/android/price_tracking_notification_bridge.cc

@@ -26,7 +26,7 @@ PriceTrackingNotificationBridge::GetForBrowserContext(
 }
 
 PriceTrackingNotificationBridge::PriceTrackingNotificationBridge() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   java_obj_.Reset(env, Java_PriceTrackingNotificationBridge_create(
                            env, reinterpret_cast<intptr_t>(this))
                            .obj());
@@ -44,7 +44,7 @@ void PriceTrackingNotificationBridge::OnNotificationPayload(
   }
 
   // Pass the payload to Java.
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_PriceTrackingNotificationBridge_showNotification(
       env, java_obj_, base::android::ToJavaByteArray(env, payload.value()));
 }

chrome/browser/data_saver/data_saver.cc

@@ -25,7 +25,7 @@ std::optional<bool> g_cached_data_saver_setting;
 base::TimeTicks g_last_setting_check_time;
 
 bool IsDataSaverEnabledBlockingCall() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return datareduction::android::Java_DataSaverOSSetting_isDataSaverEnabled(
       env);
 }

chrome/browser/flags/android/chrome_session_state.cc

@@ -113,7 +113,7 @@ MultipleUserProfilesState GetMultipleUserProfilesState() {
   static MultipleUserProfilesState multiple_user_profiles_state =
       static_cast<MultipleUserProfilesState>(
           Java_ChromeSessionState_getMultipleUserProfilesState(
-              base::android::AttachCurrentThread()));
+              jni_zero::AttachCurrentThread()));
   return multiple_user_profiles_state;
 }
 

chrome/browser/language/android/language_bridge.cc

@@ -32,7 +32,7 @@ PrefService* GetPrefService() {
 namespace language {
 std::vector<std::string> LanguageBridge::GetULPLanguagesFromDevice(
     std::string account_name) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> account_name_java =
       ConvertUTF8ToJavaString(env, account_name);
   ScopedJavaLocalRef<jobjectArray> languages_java =

chrome/browser/metrics/chrome_android_metrics_provider.cc

@@ -26,7 +26,7 @@ const int kAppNotificationStatusBoundary = 3;
 
 void EmitAppNotificationStatusHistogram() {
   auto status = Java_NotificationSystemStatusUtil_getAppNotificationStatus(
-      base::android::AttachCurrentThread());
+      jni_zero::AttachCurrentThread());
   UMA_HISTOGRAM_ENUMERATION("Android.AppNotificationStatus", status,
                             kAppNotificationStatusBoundary);
 }

chrome/browser/notifications/notification_platform_bridge_android.cc

@@ -8,6 +8,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/check.h"

chrome/browser/notifications/notification_suspender_android.cc

@@ -19,12 +19,12 @@
 #include "ui/gfx/image/image.h"
 
 using base::android::AppendJavaStringArrayToStringVector;
-using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserContext;
 using content::NotificationResourceData;
 using content::PlatformNotificationContext;
+using jni_zero::AttachCurrentThread;
 
 namespace {
 

chrome/browser/notifications/scheduler/display_agent_android.cc

@@ -71,7 +71,7 @@ void DisplayAgentAndroid::ShowNotification(
     std::unique_ptr<SystemData> system_data) {
   // TODO(xingliu): Refactor and hook to NotificationDisplayService.
   DCHECK(notification_data);
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(!notification_data->title.empty());
   DCHECK(!notification_data->message.empty());
 

chrome/browser/profiles/profile_manager_android.cc

@@ -15,7 +15,7 @@ ProfileManagerAndroid::~ProfileManagerAndroid() = default;
 
 void ProfileManagerAndroid::OnProfileAdded(Profile* profile) {
   Java_ProfileManager_onProfileAdded(
-      base::android::AttachCurrentThread(),
+      jni_zero::AttachCurrentThread(),
       ProfileAndroid::FromProfile(profile)->GetJavaObject());
 }
 

chrome/browser/share/editor_screenshot_task.cc

@@ -13,11 +13,11 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/snapshot/snapshot.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 using ui::WindowAndroid;
 
 namespace chrome {

chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc

@@ -47,7 +47,7 @@ void ClickToCallMessageHandler::OnMessage(
 
 void ClickToCallMessageHandler::HandlePhoneNumber(
     const std::string& phone_number) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_ClickToCallMessageHandler_handleMessage(
       env, base::android::ConvertUTF8ToJavaString(env, phone_number));
 }

chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_android.cc

@@ -22,7 +22,7 @@ void SharedClipboardMessageHandlerAndroid::ShowNotification(
   TRACE_EVENT0("sharing",
                "SharedClipboardMessageHandlerAndroid::ShowNotification");
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_SharedClipboardMessageHandler_showNotification(
       env, base::android::ConvertUTF8ToJavaString(env, device_name));
 }

chrome/browser/sharing/sharing_device_registration.cc

@@ -302,7 +302,7 @@ SharingDeviceRegistration::GetEnabledFeatures(bool supports_vapid) const {
 
 bool SharingDeviceRegistration::IsClickToCallSupported() const {
 #if BUILDFLAG(IS_ANDROID)
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return Java_SharingJNIBridge_isTelephonySupported(env);
 #else
   return false;

chrome/browser/touch_to_fill/password_manager/no_passkeys/android/no_passkeys_bottom_sheet_bridge.cc

@@ -22,20 +22,20 @@ class JniDelegateImpl : public JniDelegate {
 
   void Create(ui::WindowAndroid* window_android) override {
     java_object_.Reset(Java_NoPasskeysBottomSheetBridge_Constructor(
-        base::android::AttachCurrentThread(),
+        jni_zero::AttachCurrentThread(),
         reinterpret_cast<intptr_t>(bridge_.get()),
         window_android->GetJavaObject()));
   }
 
   void Show(const std::string& origin) override {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     Java_NoPasskeysBottomSheetBridge_show(
         env, java_object_, base::android::ConvertUTF8ToJavaString(env, origin));
   }
 
   void Dismiss() override {
-    Java_NoPasskeysBottomSheetBridge_dismiss(
-        base::android::AttachCurrentThread(), java_object_);
+    Java_NoPasskeysBottomSheetBridge_dismiss(jni_zero::AttachCurrentThread(),
+                                             java_object_);
   }
 
  private:

chrome/browser/ui/android/layouts/scene_layer.cc

@@ -32,7 +32,7 @@ SceneLayer::SceneLayer(JNIEnv* env,
 }
 
 SceneLayer::~SceneLayer() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_scene_layer_.get(env);
   if (jobj.is_null())
     return;

chrome/browser/ui/webui/internals/lens/lens_internals_ui_message_handler.cc

@@ -41,7 +41,7 @@ void LensInternalsUIMessageHandler::RegisterMessages() {
 
 void LensInternalsUIMessageHandler::HandleStartDebugMode(
     const base::Value::List& args) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
 
   Java_LensDebugBridge_startProactiveDebugMode(env);
 
@@ -53,7 +53,7 @@ void LensInternalsUIMessageHandler::HandleRefreshDebugData(
     const base::Value::List& args) {
   // Only needs to be called once.
   AllowJavascript();
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
 
   base::android::ScopedJavaLocalRef<jobjectArray> j_debug_data =
       Java_LensDebugBridge_refreshDebugData(env);
@@ -77,7 +77,7 @@ void LensInternalsUIMessageHandler::HandleRefreshDebugData(
 
 void LensInternalsUIMessageHandler::HandleStopDebugMode(
     const base::Value::List& args) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
 
   Java_LensDebugBridge_stopProactiveDebugMode(env);
 

components/browser_ui/accessibility/android/font_size_prefs_android.cc

@@ -83,13 +83,13 @@ jlong JNI_FontSizePrefs_Init(
 }
 
 void FontSizePrefsAndroid::OnFontScaleFactorChanged() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   float factor = GetFontScaleFactor(env, java_ref_);
   Java_FontSizePrefs_onFontScaleFactorChanged(env, java_ref_, factor);
 }
 
 void FontSizePrefsAndroid::OnForceEnableZoomChanged() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   bool enabled = GetForceEnableZoom(env, java_ref_);
   Java_FontSizePrefs_onForceEnableZoomChanged(env, java_ref_, enabled);
 }

components/component_updater/android/background_task_update_scheduler.cc

@@ -20,7 +20,7 @@ const base::TimeDelta kOnStartTaskDelay = base::Seconds(2);
 }  // namespace
 
 BackgroundTaskUpdateScheduler::BackgroundTaskUpdateScheduler() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   j_update_scheduler_.Reset(Java_UpdateScheduler_getInstance(env));
   Java_UpdateScheduler_setNativeScheduler(env, j_update_scheduler_,
                                           reinterpret_cast<intptr_t>(this));
@@ -36,12 +36,12 @@ void BackgroundTaskUpdateScheduler::Schedule(
   user_task_ = user_task;
   on_stop_ = on_stop;
   Java_UpdateScheduler_schedule(
-      base::android::AttachCurrentThread(), j_update_scheduler_,
+      jni_zero::AttachCurrentThread(), j_update_scheduler_,
       initial_delay.InMilliseconds(), delay.InMilliseconds());
 }
 
 void BackgroundTaskUpdateScheduler::Stop() {
-  Java_UpdateScheduler_cancelTask(base::android::AttachCurrentThread(),
+  Java_UpdateScheduler_cancelTask(jni_zero::AttachCurrentThread(),
                                   j_update_scheduler_);
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
@@ -66,7 +66,7 @@ void BackgroundTaskUpdateScheduler::OnStopTask(
 }
 
 void BackgroundTaskUpdateScheduler::OnStartTaskDelayed() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!user_task_) {
     LOG(WARNING) << "No components registered to update";
     Java_UpdateScheduler_finishTask(env, j_update_scheduler_,

components/crash/android/pure_java_exception_handler.cc

@@ -8,5 +8,5 @@
 
 void UninstallPureJavaExceptionHandler() {
   Java_PureJavaExceptionHandler_uninstallHandler(
-      base::android::AttachCurrentThread());
+      jni_zero::AttachCurrentThread());
 }

components/dom_distiller/core/distilled_page_prefs_android.cc

@@ -98,19 +98,19 @@ void DistilledPagePrefsObserverAndroid::DestroyObserverAndroid(JNIEnv* env) {
 
 void DistilledPagePrefsObserverAndroid::OnChangeFontFamily(
     mojom::FontFamily new_font_family) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_DistilledPagePrefsObserverWrapper_onChangeFontFamily(
       env, java_ref_, (int)new_font_family);
 }
 
 void DistilledPagePrefsObserverAndroid::OnChangeTheme(mojom::Theme new_theme) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_DistilledPagePrefsObserverWrapper_onChangeTheme(env, java_ref_,
                                                        (int)new_theme);
 }
 
 void DistilledPagePrefsObserverAndroid::OnChangeFontScaling(float scaling) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_DistilledPagePrefsObserverWrapper_onChangeFontScaling(env, java_ref_,
                                                              scaling);
 }

components/embedder_support/android/metrics/android_metrics_log_uploader.cc

@@ -25,7 +25,7 @@ AndroidMetricsLogUploader::~AndroidMetricsLogUploader() = default;
 
 int32_t UploadLogWithUploader(const std::string& log_data,
                               const bool async_metric_logging_feature) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> java_data = ToJavaByteArray(env, log_data);
 
   return Java_AndroidMetricsLogUploader_uploadLog(env, java_data,

components/image_fetcher/image_fetcher_bridge.cc

@@ -268,7 +268,7 @@ void ImageFetcherBridge::OnImageDataFetched(
     base::android::ScopedJavaGlobalRef<jobject> callback,
     const std::string& image_data,
     const RequestMetadata& request_metadata) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> j_bytes =
       base::android::ToJavaByteArray(env, image_data);
 

components/media_router/browser/android/flinging_controller_bridge.cc

@@ -27,21 +27,21 @@ FlingingControllerBridge::FlingingControllerBridge(
 FlingingControllerBridge::~FlingingControllerBridge() = default;
 
 void FlingingControllerBridge::Play() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_play(env, j_flinging_controller_bridge_);
 }
 
 void FlingingControllerBridge::Pause() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_pause(env, j_flinging_controller_bridge_);
 }
 
 void FlingingControllerBridge::SetMute(bool mute) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_setMute(env, j_flinging_controller_bridge_,
@@ -49,7 +49,7 @@ void FlingingControllerBridge::SetMute(bool mute) {
 }
 
 void FlingingControllerBridge::SetVolume(float volume) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_setVolume(env, j_flinging_controller_bridge_,
@@ -57,7 +57,7 @@ void FlingingControllerBridge::SetVolume(float volume) {
 }
 
 void FlingingControllerBridge::Seek(base::TimeDelta time) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_seek(env, j_flinging_controller_bridge_,
@@ -73,7 +73,7 @@ void FlingingControllerBridge::AddMediaStatusObserver(
   DCHECK(!observer_);
   observer_ = observer;
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_addNativeFlingingController(
@@ -85,7 +85,7 @@ void FlingingControllerBridge::RemoveMediaStatusObserver(
   DCHECK_EQ(observer_, observer);
   observer_ = nullptr;
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   Java_FlingingControllerBridge_clearNativeFlingingController(
@@ -140,7 +140,7 @@ void FlingingControllerBridge::OnMediaStatusUpdated(
 }
 
 base::TimeDelta FlingingControllerBridge::GetApproximateCurrentTime() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env);
 
   long time_in_ms = Java_FlingingControllerBridge_getApproximateCurrentTime(

components/omnibox/browser/suggestion_answer.cc

@@ -467,7 +467,7 @@ ScopedJavaLocalRef<jobject> CreateJavaImageLine(
 }  // namespace
 
 ScopedJavaLocalRef<jobject> SuggestionAnswer::CreateJavaObject() const {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return Java_SuggestionAnswer_createSuggestionAnswer(
       env, static_cast<int>(type_), CreateJavaImageLine(env, &first_line_),
       CreateJavaImageLine(env, &second_line_));

components/payments/content/android/csp_checker_android.cc

@@ -52,7 +52,7 @@ void CSPCheckerAndroid::AllowConnectToSource(
     const GURL& url_before_redirects,
     bool did_follow_redirect,
     base::OnceCallback<void(bool)> result_callback) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!env)
     return;
 

components/prefs/android/pref_service_android.cc

@@ -9,9 +9,9 @@
 #include "components/prefs/android/jni_headers/PrefService_jni.h"
 #include "components/prefs/pref_service.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 PrefServiceAndroid::PrefServiceAndroid(PrefService* pref_service)
     : pref_service_(pref_service) {}

components/search_engines/android/template_url_service_android.cc

@@ -48,7 +48,7 @@ TemplateUrlServiceAndroid::TemplateUrlServiceAndroid(
 
 TemplateUrlServiceAndroid::~TemplateUrlServiceAndroid() {
   if (java_ref_) {
-    Java_TemplateUrlService_clearNativePtr(base::android::AttachCurrentThread(),
+    Java_TemplateUrlService_clearNativePtr(jni_zero::AttachCurrentThread(),
                                            java_ref_);
     java_ref_.Reset();
   }
@@ -56,7 +56,7 @@ TemplateUrlServiceAndroid::~TemplateUrlServiceAndroid() {
 }
 
 ScopedJavaLocalRef<jobject> TemplateUrlServiceAndroid::GetJavaObject() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!java_ref_) {
     java_ref_.Reset(
         Java_TemplateUrlService_create(env, reinterpret_cast<intptr_t>(this)));
@@ -159,14 +159,14 @@ bool TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle() {
 
 void TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded() {
   template_url_subscription_ = {};
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!java_ref_)
     return;
   Java_TemplateUrlService_templateUrlServiceLoaded(env, java_ref_);
 }
 
 void TemplateUrlServiceAndroid::OnTemplateURLServiceChanged() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!java_ref_)
     return;
   Java_TemplateUrlService_onTemplateURLServiceChanged(env, java_ref_);

components/signin/internal/identity_manager/account_tracker_service.cc

@@ -184,7 +184,7 @@ std::string AccountsToString(
 
 AccountTrackerService::AccountTrackerService() {
 #if BUILDFLAG(IS_ANDROID)
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> java_ref =
       signin::Java_AccountTrackerService_Constructor(
           env, reinterpret_cast<intptr_t>(this));
@@ -195,7 +195,7 @@ AccountTrackerService::AccountTrackerService() {
 AccountTrackerService::~AccountTrackerService() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 #if BUILDFLAG(IS_ANDROID)
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   signin::Java_AccountTrackerService_destroy(env, java_ref_);
 #endif
   pref_service_ = nullptr;

content/browser/android/launcher_thread.cc

@@ -21,7 +21,7 @@ scoped_refptr<base::SingleThreadTaskRunner> LauncherThread::GetTaskRunner() {
 LauncherThread::LauncherThread()
     : java_handler_thread_(nullptr,
                            Java_LauncherThread_getHandlerThread(
-                               base::android::AttachCurrentThread())) {
+                               jni_zero::AttachCurrentThread())) {
   java_handler_thread_.Start();
 }
 

content/browser/web_contents/view_structure_builder_android.cc

@@ -12,9 +12,9 @@ namespace content {
 
 void ViewStructureBuilder_populateViewStructureNode(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node,
-    const base::android::JavaRef<jstring>& text,
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node,
+    const jni_zero::JavaRef<jstring>& text,
     jboolean has_selection,
     JniIntWrapper sel_start,
     JniIntWrapper sel_end,
@@ -25,7 +25,7 @@ void ViewStructureBuilder_populateViewStructureNode(
     jboolean italic,
     jboolean underline,
     jboolean line_through,
-    const base::android::JavaRef<jstring>& class_name,
+    const jni_zero::JavaRef<jstring>& class_name,
     JniIntWrapper child_count) {
   Java_ViewStructureBuilder_populateViewStructureNode(
       env, obj, node, text, has_selection, sel_start, sel_end, color, bgcolor,
@@ -34,8 +34,8 @@ void ViewStructureBuilder_populateViewStructureNode(
 
 void ViewStructureBuilder_setViewStructureNodeBounds(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node,
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node,
     jboolean is_root_node,
     JniIntWrapper parent_relative_left,
     JniIntWrapper parent_relative_top,
@@ -58,36 +58,36 @@ void ViewStructureBuilder_setViewStructureNodeBounds(
 
 void ViewStructureBuilder_setViewStructureNodeHtmlInfo(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node,
-    const base::android::JavaRef<jstring>& html_tag,
-    const base::android::JavaRef<jstring>& css_display,
-    const base::android::JavaRef<jobjectArray>& html_attributes) {
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node,
+    const jni_zero::JavaRef<jstring>& html_tag,
+    const jni_zero::JavaRef<jstring>& css_display,
+    const jni_zero::JavaRef<jobjectArray>& html_attributes) {
   Java_ViewStructureBuilder_setViewStructureNodeHtmlInfo(
       env, obj, node, html_tag, css_display, html_attributes);
 }
 
 void ViewStructureBuilder_setViewStructureNodeHtmlMetadata(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node,
-    const base::android::JavaRef<jobjectArray>& metadata_strings) {
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node,
+    const jni_zero::JavaRef<jobjectArray>& metadata_strings) {
   Java_ViewStructureBuilder_setViewStructureNodeHtmlMetadata(env, obj, node,
                                                              metadata_strings);
 }
 
 void ViewStructureBuilder_commitViewStructureNode(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node) {
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node) {
   Java_ViewStructureBuilder_commitViewStructureNode(env, obj, node);
 }
 
-base::android::ScopedJavaLocalRef<jobject>
+jni_zero::ScopedJavaLocalRef<jobject>
 ViewStructureBuilder_addViewStructureNodeChild(
     JNIEnv* env,
-    const base::android::JavaRef<jobject>& obj,
-    const base::android::JavaRef<jobject>& node,
+    const jni_zero::JavaRef<jobject>& obj,
+    const jni_zero::JavaRef<jobject>& node,
     JniIntWrapper index) {
   return Java_ViewStructureBuilder_addViewStructureNodeChild(env, obj, node,
                                                              index);

content/common/android/hash_set.cc

@@ -7,19 +7,19 @@
 namespace content {
 
 void JNI_Java_HashSet_add(JNIEnv* env,
-                          const base::android::JavaRef<jobject>& hash_set,
-                          const base::android::JavaRef<jobject>& object) {
+                          const jni_zero::JavaRef<jobject>& hash_set,
+                          const jni_zero::JavaRef<jobject>& object) {
   JNI_HashSet::Java_HashSet_add(env, hash_set, object);
 }
 
 void JNI_Java_HashSet_remove(JNIEnv* env,
-                             const base::android::JavaRef<jobject>& hash_set,
-                             const base::android::JavaRef<jobject>& object) {
+                             const jni_zero::JavaRef<jobject>& hash_set,
+                             const jni_zero::JavaRef<jobject>& object) {
   JNI_HashSet::Java_HashSet_remove(env, hash_set, object);
 }
 
 void JNI_Java_HashSet_clear(JNIEnv* env,
-                            const base::android::JavaRef<jobject>& hash_set) {
+                            const jni_zero::JavaRef<jobject>& hash_set) {
   JNI_HashSet::Java_HashSet_clear(env, hash_set);
 }
 

media/capture/video/android/video_capture_device_factory_android.cc

@@ -14,9 +14,9 @@
 #include "media/capture/video/android/capture_jni_headers/VideoCaptureFactory_jni.h"
 #include "media/capture/video/android/video_capture_device_android.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace media {
 

media/gpu/android/video_accelerator_util.cc

@@ -15,7 +15,7 @@ const std::vector<MediaCodecEncoderInfo>& GetEncoderInfoCache() {
   static const base::NoDestructor<std::vector<MediaCodecEncoderInfo>> infos([] {
     // Sadly the NDK doesn't provide a mechanism for accessing the equivalent of
     // the SDK's MediaCodecList, so we must call into Java to enumerate support.
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     CHECK(env);
     auto java_profiles =
         Java_VideoAcceleratorUtil_getSupportedEncoderProfiles(env);
@@ -72,7 +72,7 @@ const std::vector<MediaCodecEncoderInfo>& GetEncoderInfoCache() {
 
 const std::vector<MediaCodecDecoderInfo>& GetDecoderInfoCache() {
   static const base::NoDestructor<std::vector<MediaCodecDecoderInfo>> infos([] {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     CHECK(env);
     auto java_profiles =
         Java_VideoAcceleratorUtil_getSupportedDecoderProfiles(env);

media/midi/midi_device_android.cc

@@ -48,19 +48,19 @@ MidiDeviceAndroid::MidiDeviceAndroid(JNIEnv* env,
 MidiDeviceAndroid::~MidiDeviceAndroid() {}
 
 std::string MidiDeviceAndroid::GetManufacturer() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return ConvertMaybeJavaString(
       env, Java_MidiDeviceAndroid_getManufacturer(env, raw_device_));
 }
 
 std::string MidiDeviceAndroid::GetProductName() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return ConvertMaybeJavaString(
       env, Java_MidiDeviceAndroid_getProduct(env, raw_device_));
 }
 
 std::string MidiDeviceAndroid::GetDeviceVersion() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return ConvertMaybeJavaString(
       env, Java_MidiDeviceAndroid_getVersion(env, raw_device_));
 }

media/midi/midi_input_port_android.cc

@@ -22,13 +22,13 @@ MidiInputPortAndroid::~MidiInputPortAndroid() {
 }
 
 bool MidiInputPortAndroid::Open() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return Java_MidiInputPortAndroid_open(env, raw_port_,
                                         reinterpret_cast<jlong>(this));
 }
 
 void MidiInputPortAndroid::Close() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_MidiInputPortAndroid_close(env, raw_port_);
 }
 

media/midi/midi_manager_android.cc

@@ -28,7 +28,7 @@ namespace {
 bool HasSystemFeatureMidi() {
   // Check if the MIDI service actually runs on the system.
   return Java_MidiManagerAndroid_hasSystemFeatureMidi(
-      base::android::AttachCurrentThread());
+      jni_zero::AttachCurrentThread());
 }
 
 }  // namespace
@@ -49,7 +49,7 @@ MidiManagerAndroid::~MidiManagerAndroid() {
     return;
 
   // Finalization steps should be implemented after the UnbindInstance() call.
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_MidiManagerAndroid_stop(env, raw_manager_);
 }
 
@@ -57,7 +57,7 @@ void MidiManagerAndroid::StartInitialization() {
   if (!service()->task_service()->BindInstance())
     return CompleteInitialization(Result::INITIALIZATION_ERROR);
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
 
   uintptr_t pointer = reinterpret_cast<uintptr_t>(this);
   raw_manager_.Reset(Java_MidiManagerAndroid_create(env, pointer));

media/midi/midi_output_port_android.cc

@@ -18,12 +18,12 @@ MidiOutputPortAndroid::~MidiOutputPortAndroid() {
 }
 
 bool MidiOutputPortAndroid::Open() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return Java_MidiOutputPortAndroid_open(env, raw_port_);
 }
 
 void MidiOutputPortAndroid::Close() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_MidiOutputPortAndroid_close(env, raw_port_);
 }
 
@@ -32,7 +32,7 @@ void MidiOutputPortAndroid::Send(const std::vector<uint8_t>& data) {
     return;
   }
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> data_to_pass =
       base::android::ToJavaByteArray(env, data);
 

media/midi/usb_midi_device_android.cc

@@ -22,7 +22,7 @@ UsbMidiDeviceAndroid::UsbMidiDeviceAndroid(
     const base::android::JavaRef<jobject>& raw_device,
     UsbMidiDeviceDelegate* delegate)
     : raw_device_(raw_device), delegate_(delegate) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_UsbMidiDeviceAndroid_registerSelf(env, raw_device_,
                                          reinterpret_cast<jlong>(this));
 
@@ -31,7 +31,7 @@ UsbMidiDeviceAndroid::UsbMidiDeviceAndroid(
 }
 
 UsbMidiDeviceAndroid::~UsbMidiDeviceAndroid() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_UsbMidiDeviceAndroid_close(env, raw_device_);
 }
 
@@ -53,7 +53,7 @@ std::string UsbMidiDeviceAndroid::GetDeviceVersion() {
 
 void UsbMidiDeviceAndroid::Send(int endpoint_number,
                                 const std::vector<uint8_t>& data) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   const uint8_t* head = data.size() ? &data[0] : NULL;
   ScopedJavaLocalRef<jbyteArray> data_to_pass =
       base::android::ToJavaByteArray(env, head, data.size());
@@ -74,7 +74,7 @@ void UsbMidiDeviceAndroid::OnData(JNIEnv* env,
 }
 
 void UsbMidiDeviceAndroid::GetDescriptorsInternal() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jbyteArray> descriptors =
       Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_);
 
@@ -106,7 +106,7 @@ void UsbMidiDeviceAndroid::InitDeviceInfo() {
 }
 
 std::vector<uint8_t> UsbMidiDeviceAndroid::GetStringDescriptor(int index) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jbyteArray> descriptors =
       Java_UsbMidiDeviceAndroid_getStringDescriptor(env, raw_device_, index);
 

media/midi/usb_midi_device_factory_android.cc

@@ -26,7 +26,7 @@ UsbMidiDeviceFactoryAndroid::UsbMidiDeviceFactoryAndroid()
     : delegate_(nullptr) {}
 
 UsbMidiDeviceFactoryAndroid::~UsbMidiDeviceFactoryAndroid() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   if (!raw_factory_.is_null())
     Java_UsbMidiDeviceFactoryAndroid_close(env, raw_factory_);
 }
@@ -35,7 +35,7 @@ void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
     UsbMidiDeviceDelegate* delegate,
     Callback callback) {
   DCHECK(!delegate_);
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   uintptr_t pointer = reinterpret_cast<uintptr_t>(this);
   raw_factory_.Reset(Java_UsbMidiDeviceFactoryAndroid_create(env, pointer));
 

net/android/traffic_stats.cc

@@ -16,25 +16,25 @@ enum TrafficStatsError {
 };
 
 bool GetTotalTxBytes(int64_t* bytes) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   *bytes = Java_AndroidTrafficStats_getTotalTxBytes(env);
   return *bytes != ERROR_NOT_SUPPORTED;
 }
 
 bool GetTotalRxBytes(int64_t* bytes) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   *bytes = Java_AndroidTrafficStats_getTotalRxBytes(env);
   return *bytes != ERROR_NOT_SUPPORTED;
 }
 
 bool GetCurrentUidTxBytes(int64_t* bytes) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   *bytes = Java_AndroidTrafficStats_getCurrentUidTxBytes(env);
   return *bytes != ERROR_NOT_SUPPORTED;
 }
 
 bool GetCurrentUidRxBytes(int64_t* bytes) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   *bytes = Java_AndroidTrafficStats_getCurrentUidRxBytes(env);
   return *bytes != ERROR_NOT_SUPPORTED;
 }

net/cert/x509_util_android.cc

@@ -5,7 +5,7 @@
 #include "net/cert/cert_database.h"
 #include "net/net_jni_headers/X509Util_jni.h"
 
-using base::android::JavaParamRef;
+using jni_zero::JavaParamRef;
 
 namespace net {
 

services/data_decoder/public/cpp/json_sanitizer_android.cc

@@ -43,7 +43,7 @@ void JsonSanitizer::Sanitize(const std::string& json, Callback callback) {
     return;
   }
 
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> json_java =
       base::android::ConvertUTF8ToJavaString(env, json);
 

services/device/generic_sensor/platform_sensor_android.cc

@@ -7,8 +7,8 @@
 #include "base/functional/bind.h"
 #include "services/device/generic_sensor/jni_headers/PlatformSensor_jni.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaRef;
+using jni_zero::AttachCurrentThread;
 
 namespace device {
 namespace {

services/device/generic_sensor/platform_sensor_provider_android.cc

@@ -19,8 +19,8 @@
 #include "services/device/generic_sensor/platform_sensor_fusion.h"
 #include "services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer.h"
 
-using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace device {
 

services/device/usb/usb_device_android.cc

@@ -85,7 +85,7 @@ void UsbDeviceAndroid::RequestPermission(ResultCallback callback) {
 void UsbDeviceAndroid::Open(OpenCallback callback) {
   scoped_refptr<UsbDeviceHandle> device_handle;
   if (service_) {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     ScopedJavaLocalRef<jobject> connection =
         service_->OpenDevice(env, j_object_);
     if (!connection.is_null()) {

services/device/usb/usb_device_handle_android.cc

@@ -48,7 +48,7 @@ void UsbDeviceHandleAndroid::FinishClose() {
 }
 
 void UsbDeviceHandleAndroid::CloseConnection() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   Java_ChromeUsbConnection_close(env, j_object_);
   j_object_.Reset();
 }

services/device/usb/usb_service_android.cc

@@ -15,9 +15,9 @@
 #include "services/device/usb/jni_headers/ChromeUsbService_jni.h"
 #include "services/device/usb/usb_device_android.h"
 
-using base::android::AttachCurrentThread;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace device {
 

ui/android/event_forwarder.cc

@@ -26,15 +26,14 @@ EventForwarder::EventForwarder(ViewAndroid* view) : view_(view) {}
 
 EventForwarder::~EventForwarder() {
   if (!java_obj_.is_null()) {
-    Java_EventForwarder_destroy(base::android::AttachCurrentThread(),
-                                java_obj_);
+    Java_EventForwarder_destroy(jni_zero::AttachCurrentThread(), java_obj_);
     java_obj_.Reset();
   }
 }
 
 ScopedJavaLocalRef<jobject> EventForwarder::GetJavaObject() {
   if (java_obj_.is_null()) {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     java_obj_.Reset(
         Java_EventForwarder_create(env, reinterpret_cast<intptr_t>(this),
                                    switches::IsTouchDragDropEnabled()));

ui/android/resources/resource_factory.cc

@@ -6,7 +6,7 @@
 #include "ui/android/ui_android_jni_headers/ResourceFactory_jni.h"
 #include "ui/gfx/geometry/rect.h"
 
-using base::android::JavaParamRef;
+using jni_zero::JavaParamRef;
 
 namespace ui {
 

ui/base/clipboard/clipboard_android.cc

@@ -52,14 +52,14 @@
 // These "other formats" only work within the same process, and can't be copied
 // between Android applications.
 
-using base::android::AttachCurrentThread;
-using base::android::ClearException;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaByteArray;
+using jni_zero::AttachCurrentThread;
+using jni_zero::ClearException;
 
 namespace ui {
 

ui/base/idle/idle_android.cc

@@ -11,9 +11,9 @@
 #include "ui/base/idle/idle_internal.h"
 #include "ui/base/ui_base_jni_headers/IdleDetector_jni.h"
 
-using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace ui {
 

ui/base/pointer/pointer_device_android.cc

@@ -8,7 +8,7 @@
 #include "base/check_op.h"
 #include "ui/base/ui_base_jni_headers/TouchDevice_jni.h"
 
-using base::android::AttachCurrentThread;
+using jni_zero::AttachCurrentThread;
 
 namespace ui {
 

ui/events/devices/input_device_observer_android.cc

@@ -7,8 +7,8 @@
 #include "base/memory/singleton.h"
 #include "ui/events/devices/ui_events_devices_jni_headers/InputDeviceObserver_jni.h"
 
-using base::android::AttachCurrentThread;
-using base::android::JavaParamRef;
+using jni_zero::AttachCurrentThread;
+using jni_zero::JavaParamRef;
 
 namespace ui {
 

ui/gfx/android/java_bitmap.cc

@@ -15,10 +15,10 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_jni_headers/BitmapHelper_jni.h"
 
-using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
-using base::android::ScopedJavaLocalRef;
 using base::android::JavaRef;
+using base::android::ScopedJavaLocalRef;
+using jni_zero::AttachCurrentThread;
 
 namespace gfx {
 namespace {

ui/gl/android/scoped_java_surface.cc

@@ -21,12 +21,12 @@ ScopedJavaSurface::ScopedJavaSurface(
     const base::android::JavaRef<jobject>& surface,
     bool auto_release)
     : auto_release_(auto_release), j_surface_(surface) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   DCHECK(env->IsInstanceOf(surface.obj(), android_view_Surface_clazz(env)));
 }
 
 ScopedJavaSurface::ScopedJavaSurface(const SurfaceTexture* surface_texture) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> tmp(
       JNI_Surface::Java_Surface_Constructor__android_graphics_SurfaceTexture(
           env, surface_texture->j_surface_texture()));
@@ -53,7 +53,7 @@ ScopedJavaSurface ScopedJavaSurface::CopyRetainOwnership() const {
 
 void ScopedJavaSurface::ReleaseSurfaceIfNeeded() {
   if (auto_release_ && !j_surface_.is_null()) {
-    JNIEnv* env = base::android::AttachCurrentThread();
+    JNIEnv* env = jni_zero::AttachCurrentThread();
     JNI_Surface::Java_Surface_release(env, j_surface_);
   }
 }
@@ -72,7 +72,7 @@ bool ScopedJavaSurface::IsEmpty() const {
 }
 
 bool ScopedJavaSurface::IsValid() const {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = jni_zero::AttachCurrentThread();
   return !IsEmpty() && JNI_Surface::Java_Surface_isValid(env, j_surface_);
 }