Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc |
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
index 6d49b8225a4da7ccfa0060535ae0ce05f364a80a..8b195a533dba1bcfbc62dda7af11b98cc169b3d9 100644 |
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc |
@@ -290,7 +290,7 @@ void AutocompleteControllerAndroid::Shutdown() { |
ScopedJavaLocalRef<jobject> java_bridge = |
weak_java_autocomplete_controller_android_.get(env); |
if (java_bridge.obj()) |
- Java_AutocompleteController_notifyNativeDestroyed(env, java_bridge.obj()); |
+ Java_AutocompleteController_notifyNativeDestroyed(env, java_bridge); |
weak_java_autocomplete_controller_android_.reset(); |
} |
@@ -385,7 +385,7 @@ void AutocompleteControllerAndroid::NotifySuggestionsReceived( |
ScopedJavaLocalRef<jobject> j_omnibox_suggestion = |
BuildOmniboxSuggestion(env, autocomplete_result.match_at(i)); |
Java_AutocompleteController_addOmniboxSuggestionToList( |
- env, suggestion_list_obj.obj(), j_omnibox_suggestion.obj()); |
+ env, suggestion_list_obj, j_omnibox_suggestion); |
} |
// Get the inline-autocomplete text. |
@@ -399,11 +399,9 @@ void AutocompleteControllerAndroid::NotifySuggestionsReceived( |
ConvertUTF16ToJavaString(env, inline_autocomplete_text); |
jlong j_autocomplete_result = |
reinterpret_cast<intptr_t>(&(autocomplete_result)); |
- Java_AutocompleteController_onSuggestionsReceived(env, |
- java_bridge.obj(), |
- suggestion_list_obj.obj(), |
- inline_text.obj(), |
- j_autocomplete_result); |
+ Java_AutocompleteController_onSuggestionsReceived( |
+ env, java_bridge, suggestion_list_obj, inline_text, |
+ j_autocomplete_result); |
} |
OmniboxEventProto::PageClassification |
@@ -534,21 +532,13 @@ AutocompleteControllerAndroid::BuildOmniboxSuggestion( |
BookmarkModel* bookmark_model = |
BookmarkModelFactory::GetForBrowserContext(profile_); |
return Java_AutocompleteController_buildOmniboxSuggestion( |
- env, |
- match.type, |
- AutocompleteMatch::IsSearchType(match.type), |
- match.relevance, |
- match.transition, |
- jcontents.obj(), |
- ToJavaIntArray(env, contents_class_offsets).obj(), |
- ToJavaIntArray(env, contents_class_styles).obj(), |
- description.obj(), |
- ToJavaIntArray(env, description_class_offsets).obj(), |
- ToJavaIntArray(env, description_class_styles).obj(), |
- answer_contents.obj(), |
- answer_type.obj(), |
- fill_into_edit.obj(), |
- destination_url.obj(), |
+ env, match.type, AutocompleteMatch::IsSearchType(match.type), |
+ match.relevance, match.transition, jcontents, |
+ ToJavaIntArray(env, contents_class_offsets), |
+ ToJavaIntArray(env, contents_class_styles), description, |
+ ToJavaIntArray(env, description_class_offsets), |
+ ToJavaIntArray(env, description_class_styles), answer_contents, |
+ answer_type, fill_into_edit, destination_url, |
bookmark_model && bookmark_model->IsBookmarked(match.destination_url), |
match.SupportsDeletion()); |
} |