jni_zero: pre-java_ref move required cleanups

Bug: 1377351
Change-Id: Ife46269cae369f9f237b107777031e3419bb485a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5133577
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1239155}

android_webview/browser/aw_settings.cc

@@ -42,6 +42,7 @@
 #include "url/origin.h"
 
 using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
@@ -228,8 +229,7 @@ void AwSettings::UpdateUserAgentLocked(JNIEnv* env,
       Java_AwSettings_getHasUserAgentMetadataOverridesLocked(env, obj);
 
   if (ua_overidden) {
-    std::string ua_string_override =
-        base::android::ConvertJavaStringToUTF8(str);
+    std::string ua_string_override = ConvertJavaStringToUTF8(str);
     std::string ua_default = GetUserAgent();
     blink::UserAgentOverride override_ua_with_metadata;
     override_ua_with_metadata.ua_string_override = ua_string_override;

android_webview/js_sandbox/service/js_sandbox_isolate.cc

@@ -355,7 +355,7 @@ jboolean JsSandboxIsolate::EvaluateJavascript(
   std::string code = ConvertJavaStringToUTF8(env, jcode);
   scoped_refptr<JsSandboxIsolateCallback> callback =
       base::MakeRefCounted<JsSandboxIsolateCallback>(
-          base::android::ScopedJavaGlobalRef(j_callback), false);
+          base::android::ScopedJavaGlobalRef<jobject>(j_callback), false);
   control_task_runner_->PostTask(
       FROM_HERE,
       base::BindOnce(&JsSandboxIsolate::PostEvaluationToIsolateThread,
@@ -377,13 +377,13 @@ jboolean JsSandboxIsolate::EvaluateJavascriptWithFd(
     const base::android::JavaParamRef<jobject>& j_pfd) {
   scoped_refptr<JsSandboxIsolateCallback> callback =
       base::MakeRefCounted<JsSandboxIsolateCallback>(
-          base::android::ScopedJavaGlobalRef(j_callback), true);
+          base::android::ScopedJavaGlobalRef<jobject>(j_callback), true);
 
   control_task_runner_->PostTask(
       FROM_HERE,
       base::BindOnce(&JsSandboxIsolate::PostFileDescriptorReadToIsolateThread,
                      base::Unretained(this), fd, length, offset,
-                     base::android::ScopedJavaGlobalRef(j_pfd),
+                     base::android::ScopedJavaGlobalRef<jobject>(j_pfd),
                      std::move(callback)));
 
   return true;

chrome/browser/android/auxiliary_search/auxiliary_search_provider.cc

@@ -148,7 +148,7 @@ void AuxiliarySearchProvider::GetNonSensitiveTabs(
     const base::android::JavaParamRef<jobjectArray>& j_tabs_android,
     const base::android::JavaParamRef<jobject>& j_callback_obj) const {
   std::vector<TabAndroid*> all_tabs = TabAndroid::GetAllNativeTabs(
-      env, base::android::ScopedJavaLocalRef(j_tabs_android));
+      env, base::android::ScopedJavaLocalRef<jobjectArray>(j_tabs_android));
 
   GetNonSensitiveTabsInternal(
       all_tabs, base::BindOnce(&callJavaCallbackWithTabList, env,

chrome/browser/android/customtabs/custom_tabs_connection.cc

@@ -34,7 +34,7 @@ std::vector<std::string> ConvertJavaStringArrayToListValue(
 
   std::vector<std::string> vector_string;
   for (auto j_str : array_reader) {
-    vector_string.push_back(ConvertJavaStringToUTF8(env, j_str));
+    vector_string.push_back(base::android::ConvertJavaStringToUTF8(env, j_str));
   }
 
   return vector_string;

chrome/browser/android/historical_tab_saver.cc

@@ -251,7 +251,7 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalGroup(
     const JavaParamRef<jintArray>& jsaved_state_versions) {
   std::u16string title = base::android::ConvertJavaStringToUTF16(env, jtitle);
   auto tabs_android = TabAndroid::GetAllNativeTabs(
-      env, base::android::ScopedJavaLocalRef(jtabs_android));
+      env, base::android::ScopedJavaLocalRef<jobjectArray>(jtabs_android));
   int tabs_android_count = env->GetArrayLength(jtabs_android);
   DCHECK_EQ(tabs_android_count, env->GetArrayLength(jbyte_buffers));
   DCHECK_EQ(tabs_android_count, env->GetArrayLength(jsaved_state_versions));
@@ -297,7 +297,7 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalBulkClosure(
       std::move(android_group_ids), std::move(group_titles),
       std::move(per_tab_android_group_id),
       TabAndroid::GetAllNativeTabs(
-          env, base::android::ScopedJavaLocalRef(jtabs_android)),
+          env, base::android::ScopedJavaLocalRef<jobjectArray>(jtabs_android)),
       std::move(web_contents_states));
 }
 

chrome/browser/android/httpclient/http_client_bridge.h

@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <vector>
+
 #include "base/android/scoped_java_ref.h"
 
 namespace httpclient {

chrome/browser/android/rlz/rlz_ping_handler.cc

@@ -28,7 +28,7 @@
 #include "services/network/public/mojom/url_response_head.mojom.h"
 #include "url/gurl.h"
 
-using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 

chrome/browser/autofill/android/personal_data_manager_android.cc

@@ -47,6 +47,7 @@
 namespace autofill {
 namespace {
 
+using ::base::android::ConvertJavaStringToUTF16;
 using ::base::android::ConvertJavaStringToUTF8;
 using ::base::android::ConvertUTF16ToJavaString;
 using ::base::android::ConvertUTF8ToJavaString;

chrome/browser/bookmarks/android/bookmark_bridge.cc

@@ -166,7 +166,7 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_GetForProfile(
                        base::WrapUnique(bookmark_bridge));
   }
 
-  return ScopedJavaLocalRef(bookmark_bridge->GetJavaBookmarkModel());
+  return ScopedJavaLocalRef<jobject>(bookmark_bridge->GetJavaBookmarkModel());
 }
 
 // TODO(crbug.com/1510547): Support the account reading list availability

chrome/browser/download/internal/android/rename_utils.cc

@@ -17,6 +17,7 @@ JNI_RenameUtils_GetFileExtension(
     JNIEnv* env,
     const base::android::JavaParamRef<jstring>& fileName) {
   std::string extension =
-      base::FilePath(ConvertJavaStringToUTF8(env, fileName)).Extension();
+      base::FilePath(base::android::ConvertJavaStringToUTF8(env, fileName))
+          .Extension();
   return ConvertUTF8ToJavaString(env, extension);
 }

chrome/browser/password_manager/android/password_store_bridge.cc

@@ -25,9 +25,9 @@ PasswordForm ConvertJavaObjectToPasswordForm(
   form.url = *url::GURLAndroid::ToNativeGURL(
       env, Java_PasswordStoreCredential_getUrl(env, credential));
   form.signon_realm = password_manager::GetSignonRealm(form.url);
-  form.username_value = ConvertJavaStringToUTF16(
+  form.username_value = base::android::ConvertJavaStringToUTF16(
       env, Java_PasswordStoreCredential_getUsername(env, credential));
-  form.password_value = ConvertJavaStringToUTF16(
+  form.password_value = base::android::ConvertJavaStringToUTF16(
       env, Java_PasswordStoreCredential_getPassword(env, credential));
 
   return form;
@@ -80,7 +80,8 @@ bool PasswordStoreBridge::EditPassword(
   password_manager::CredentialUIEntry original_credential(
       ConvertJavaObjectToPasswordForm(env, credential));
   password_manager::CredentialUIEntry updated_credential = original_credential;
-  updated_credential.password = ConvertJavaStringToUTF16(env, new_password);
+  updated_credential.password =
+      base::android::ConvertJavaStringToUTF16(env, new_password);
   return saved_passwords_presenter_.EditSavedCredentials(original_credential,
                                                          updated_credential) ==
          password_manager::SavedPasswordsPresenter::EditResult::kSuccess;

chrome/browser/privacy_sandbox/android/privacy_sandbox_bridge.cc

@@ -109,7 +109,7 @@ static void JNI_PrivacySandboxBridge_GetFledgeJoiningEtldPlusOneForDisplay(
             base::android::RunObjectCallbackAndroid(
                 j_callback, base::android::ToJavaArrayOfStrings(env, strings));
           },
-          base::android::ScopedJavaGlobalRef(j_callback)));
+          base::android::ScopedJavaGlobalRef<jobject>(j_callback)));
 }
 
 static base::android::ScopedJavaLocalRef<jobjectArray>
@@ -169,7 +169,7 @@ JNI_PrivacySandboxBridge_GetFirstPartySetOwner(
     JNIEnv* env,
     const JavaParamRef<jstring>& memberOrigin) {
   auto fpsOwner = GetPrivacySandboxService()->GetFirstPartySetOwner(
-      GURL(ConvertJavaStringToUTF8(env, memberOrigin)));
+      GURL(base::android::ConvertJavaStringToUTF8(env, memberOrigin)));
 
   if (!fpsOwner.has_value()) {
     return nullptr;
@@ -181,8 +181,8 @@ JNI_PrivacySandboxBridge_GetFirstPartySetOwner(
 static jboolean JNI_PrivacySandboxBridge_IsPartOfManagedFirstPartySet(
     JNIEnv* env,
     const JavaParamRef<jstring>& origin) {
-  auto schemefulSite =
-      net::SchemefulSite(GURL(ConvertJavaStringToUTF8(env, origin)));
+  auto schemefulSite = net::SchemefulSite(
+      GURL(base::android::ConvertJavaStringToUTF8(env, origin)));
 
   return GetPrivacySandboxService()->IsPartOfManagedFirstPartySet(
       schemefulSite);

chrome/browser/supervised_user/android/website_parent_approval.cc

@@ -98,5 +98,5 @@ static void JNI_WebsiteParentApproval_FetchFavicon(
 
   faviconFetcher->FetchFavicon(
       url, true, min_source_size_in_pixel, desired_size_in_pixel,
-      base::android::ScopedJavaGlobalRef(on_favicon_fetched_callback));
+      base::android::ScopedJavaGlobalRef<jobject>(on_favicon_fetched_callback));
 }

chrome/browser/ui/android/tab_model/tab_model_observer_jni_bridge.cc

@@ -80,8 +80,8 @@ void TabModelObserverJniBridge::OnFinishingMultipleTabClosure(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobj,
     const base::android::JavaParamRef<jobjectArray>& jtabs) {
-  std::vector<TabAndroid*> tabs =
-      TabAndroid::GetAllNativeTabs(env, ScopedJavaLocalRef(jtabs));
+  std::vector<TabAndroid*> tabs = TabAndroid::GetAllNativeTabs(
+      env, ScopedJavaLocalRef<jobjectArray>(jtabs));
   for (auto& observer : observers_)
     observer.OnFinishingMultipleTabClosure(tabs);
 }
@@ -153,8 +153,8 @@ void TabModelObserverJniBridge::AllTabsPendingClosure(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     const JavaParamRef<jobjectArray>& jtabs) {
-  std::vector<TabAndroid*> tabs =
-      TabAndroid::GetAllNativeTabs(env, ScopedJavaLocalRef(jtabs));
+  std::vector<TabAndroid*> tabs = TabAndroid::GetAllNativeTabs(
+      env, ScopedJavaLocalRef<jobjectArray>(jtabs));
   for (auto& observer : observers_)
     observer.AllTabsPendingClosure(tabs);
 }

components/content_relationship_verification/origin_verifier.cc

@@ -22,7 +22,7 @@
 #include "url/origin.h"
 
 using base::android::AppendJavaStringArrayToStringVector;
-using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using content_relationship_verification::RelationshipCheckResult;
@@ -109,4 +109,4 @@ static jlong JNI_OriginVerifier_Init(
     const base::android::JavaParamRef<jobject>& obj,
     const base::android::JavaParamRef<jobject>& jbrowser_context_handle) {
   return OriginVerifier::Init(env, obj, jbrowser_context_handle);
-}
+}

components/omnibox/browser/actions/omnibox_action_factory_android.cc

@@ -46,7 +46,7 @@ base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxPedal(
     const std::u16string& hint,
     const std::u16string& accessibility_hint,
     OmniboxPedalId pedal_id) {
-  return base::android::ScopedJavaGlobalRef(
+  return base::android::ScopedJavaGlobalRef<jobject>(
       Java_OmniboxActionFactory_buildOmniboxPedal(
           env, g_java_factory.Get(), instance,
           base::android::ConvertUTF16ToJavaString(env, hint),
@@ -60,7 +60,7 @@ base::android::ScopedJavaGlobalRef<jobject> BuildHistoryClustersAction(
     const std::u16string& hint,
     const std::u16string& accessibility_hint,
     const std::string& query) {
-  return base::android::ScopedJavaGlobalRef(
+  return base::android::ScopedJavaGlobalRef<jobject>(
       Java_OmniboxActionFactory_buildHistoryClustersAction(
           env, g_java_factory.Get(), instance,
           base::android::ConvertUTF16ToJavaString(env, hint),
@@ -75,7 +75,7 @@ base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxActionInSuggest(
     const std::u16string& accessibility_hint,
     int action_type,
     const std::string& action_uri) {
-  return base::android::ScopedJavaGlobalRef(
+  return base::android::ScopedJavaGlobalRef<jobject>(
       Java_OmniboxActionFactory_buildActionInSuggest(
           env, g_java_factory.Get(), instance,
           base::android::ConvertUTF16ToJavaString(env, hint),

components/security_interstitials/content/captive_portal_helper_android.cc

@@ -29,7 +29,7 @@ void JNI_CaptivePortalHelper_SetCaptivePortalCertificateForTesting(
       FROM_HERE, base::BindOnce(SSLErrorHandler::SetErrorAssistantProto,
                                 std::move(default_proto)));
 
-  const std::string hash = ConvertJavaStringToUTF8(env, jhash);
+  const std::string hash = base::android::ConvertJavaStringToUTF8(env, jhash);
   auto config_proto =
       std::make_unique<chrome_browser_ssl::SSLErrorAssistantConfig>();
   config_proto->set_version_id(INT_MAX);

components/webauthn/android/webauthn_browser_bridge.cc

@@ -17,6 +17,8 @@
 #include "device/fido/discoverable_credential_metadata.h"
 #include "device/fido/public_key_credential_user_entity.h"
 
+using base::android::ConvertJavaStringToUTF8;
+using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace webauthn {
@@ -122,14 +124,14 @@ void WebAuthnBrowserBridge::OnCredentialsDetailsListReceived(
   if (jhybrid_callback != nullptr) {
     hybrid_callback = base::BindRepeating(
         &OnHybridAssertionInvoked,
-        base::android::ScopedJavaGlobalRef<jobject>(env, jhybrid_callback));
+        ScopedJavaGlobalRef<jobject>(env, jhybrid_callback));
   }
 
   client->OnWebAuthnRequestPending(
       render_frame_host, credentials_metadata, is_conditional_request,
-      base::BindRepeating(&OnWebAuthnCredentialSelected,
-                          base::android::ScopedJavaGlobalRef<jobject>(
-                              env, jget_assertion_callback)),
+      base::BindRepeating(
+          &OnWebAuthnCredentialSelected,
+          ScopedJavaGlobalRef<jobject>(env, jget_assertion_callback)),
       std::move(hybrid_callback));
 }
 
@@ -154,9 +156,9 @@ void WebAuthnBrowserBridge::OnCredManConditionalRequestPending(
   }
   client->OnCredManConditionalRequestPending(
       render_frame_host, jhas_results,
-      base::BindRepeating(&TriggerFullRequest,
-                          base::android::ScopedJavaGlobalRef<jobject>(
-                              env, jfull_request_runnable)));
+      base::BindRepeating(
+          &TriggerFullRequest,
+          ScopedJavaGlobalRef<jobject>(env, jfull_request_runnable)));
 }
 
 void WebAuthnBrowserBridge::OnCredManUiClosed(

content/browser/renderer_host/render_frame_host_android.cc

@@ -30,6 +30,7 @@
 #include "url/origin.h"
 
 using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;

device/bluetooth/bluetooth_device_android.cc

@@ -12,6 +12,7 @@
 #include "device/bluetooth/jni_headers/ChromeBluetoothDevice_jni.h"
 
 using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 
@@ -230,8 +231,7 @@ void BluetoothDeviceAndroid::CreateGattRemoteService(
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>&
         bluetooth_gatt_service_wrapper) {  // BluetoothGattServiceWrapper
-  std::string instance_id_string =
-      base::android::ConvertJavaStringToUTF8(env, instance_id);
+  std::string instance_id_string = ConvertJavaStringToUTF8(env, instance_id);
 
   if (base::Contains(gatt_services_, instance_id_string))
     return;

device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc

@@ -20,6 +20,7 @@
 #include "device/bluetooth/jni_headers/ChromeBluetoothRemoteGattCharacteristic_jni.h"
 
 using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 
@@ -272,8 +273,7 @@ void BluetoothRemoteGattCharacteristicAndroid::CreateGattRemoteDescriptor(
     bluetooth_gatt_descriptor_wrapper,
     const JavaParamRef<jobject>& /* ChromeBluetoothDevice */
     chrome_bluetooth_device) {
-  std::string instanceIdString =
-      base::android::ConvertJavaStringToUTF8(env, instanceId);
+  std::string instanceIdString = ConvertJavaStringToUTF8(env, instanceId);
 
   DCHECK(!base::Contains(descriptors_, instanceIdString));
   AddDescriptor(BluetoothRemoteGattDescriptorAndroid::Create(

device/bluetooth/bluetooth_remote_gatt_service_android.cc

@@ -112,9 +112,9 @@ std::string BluetoothRemoteGattServiceAndroid::GetIdentifier() const {
 }
 
 device::BluetoothUUID BluetoothRemoteGattServiceAndroid::GetUUID() const {
-  return device::BluetoothUUID(
-      ConvertJavaStringToUTF8(Java_ChromeBluetoothRemoteGattService_getUUID(
-          AttachCurrentThread(), j_service_)));
+  return device::BluetoothUUID(base::android::ConvertJavaStringToUTF8(
+      Java_ChromeBluetoothRemoteGattService_getUUID(AttachCurrentThread(),
+                                                    j_service_)));
 }
 
 bool BluetoothRemoteGattServiceAndroid::IsPrimary() const {

ui/base/l10n/l10n_util_android.cc

@@ -91,7 +91,7 @@ std::u16string GetDisplayNameForLocale(const std::string& locale,
   ScopedJavaLocalRef<jstring> java_result(
       Java_LocalizationUtils_getDisplayNameForLocale(env, java_locale,
                                                      java_display_locale));
-  return ConvertJavaStringToUTF16(java_result);
+  return base::android::ConvertJavaStringToUTF16(java_result);
 }
 
 ScopedJavaLocalRef<jstring> JNI_LocalizationUtils_GetNativeUiLocale(

url/android/gurl_android.cc

@@ -40,7 +40,7 @@ static std::unique_ptr<GURL> FromJavaGURL(JNIEnv* env,
                                           bool is_valid,
                                           jlong parsed_ptr) {
   Parsed* parsed = reinterpret_cast<Parsed*>(parsed_ptr);
-  const std::string& spec = ConvertJavaStringToUTF8(env, j_spec);
+  const std::string& spec = base::android::ConvertJavaStringToUTF8(env, j_spec);
   std::unique_ptr<GURL> gurl =
       std::make_unique<GURL>(spec.data(), parsed->Length(), *parsed, is_valid);
   delete parsed;
@@ -143,7 +143,8 @@ static jboolean JNI_GURL_DomainIs(JNIEnv* env,
                                   jlong parsed_ptr,
                                   const JavaParamRef<jstring>& j_domain) {
   std::unique_ptr<GURL> gurl = FromJavaGURL(env, j_spec, is_valid, parsed_ptr);
-  const std::string& domain = ConvertJavaStringToUTF8(env, j_domain);
+  const std::string& domain =
+      base::android::ConvertJavaStringToUTF8(env, j_domain);
   return gurl->DomainIs(domain);
 }
 
@@ -181,14 +182,16 @@ static void JNI_GURL_ReplaceComponents(
   if (clear_username) {
     replacements.ClearUsername();
   } else if (j_username_replacement) {
-    username = ConvertJavaStringToUTF8(env, j_username_replacement);
+    username =
+        base::android::ConvertJavaStringToUTF8(env, j_username_replacement);
     replacements.SetUsernameStr(username);
   }
 
   if (clear_password) {
     replacements.ClearPassword();
   } else if (j_password_replacement) {
-    password = ConvertJavaStringToUTF8(env, j_password_replacement);
+    password =
+        base::android::ConvertJavaStringToUTF8(env, j_password_replacement);
     replacements.SetPasswordStr(password);
   }