Index: chrome/browser/android/contextualsearch/contextual_search_manager.cc |
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.cc b/chrome/browser/android/contextualsearch/contextual_search_manager.cc |
index 4378d90c7d37ad734ecd1db4eec3d142e97e583a..4bd594d2f38d3f67a1be0c586966ef183a47b5cc 100644 |
--- a/chrome/browser/android/contextualsearch/contextual_search_manager.cc |
+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.cc |
@@ -99,7 +99,7 @@ ContextualSearchManager::GetTargetLanguage(JNIEnv* env, |
DCHECK(delegate_); |
std::string target_language(delegate_->GetTargetLanguage()); |
base::android::ScopedJavaLocalRef<jstring> j_target_language = |
- base::android::ConvertUTF8ToJavaString(env, target_language.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, target_language); |
return j_target_language; |
} |
@@ -108,7 +108,7 @@ ContextualSearchManager::GetAcceptLanguages(JNIEnv* env, |
const JavaParamRef<jobject>& obj) { |
std::string accept_languages = delegate_->GetAcceptLanguages(); |
base::android::ScopedJavaLocalRef<jstring> j_accept_languages = |
- base::android::ConvertUTF8ToJavaString(env, accept_languages.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, accept_languages); |
return j_accept_languages; |
} |
@@ -117,30 +117,27 @@ void ContextualSearchManager::OnSearchTermResolutionResponse( |
// Notify the Java UX of the result. |
JNIEnv* env = base::android::AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jstring> j_search_term = |
- base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.search_term.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, |
+ resolved_search_term.search_term); |
base::android::ScopedJavaLocalRef<jstring> j_display_text = |
- base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.display_text.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, |
+ resolved_search_term.display_text); |
base::android::ScopedJavaLocalRef<jstring> j_alternate_term = |
base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.alternate_term.c_str()); |
+ env, resolved_search_term.alternate_term); |
base::android::ScopedJavaLocalRef<jstring> j_mid = |
- base::android::ConvertUTF8ToJavaString(env, |
- resolved_search_term.mid.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, resolved_search_term.mid); |
base::android::ScopedJavaLocalRef<jstring> j_context_language = |
base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.context_language.c_str()); |
+ env, resolved_search_term.context_language); |
base::android::ScopedJavaLocalRef<jstring> j_thumbnail_url = |
base::android::ConvertUTF8ToJavaString( |
- env, |
- resolved_search_term.thumbnail_url.c_str()); |
+ env, resolved_search_term.thumbnail_url); |
base::android::ScopedJavaLocalRef<jstring> j_caption = |
- base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.caption.c_str()); |
+ base::android::ConvertUTF8ToJavaString(env, resolved_search_term.caption); |
base::android::ScopedJavaLocalRef<jstring> j_quick_action_uri = |
base::android::ConvertUTF8ToJavaString( |
- env, resolved_search_term.quick_action_uri.c_str()); |
+ env, resolved_search_term.quick_action_uri); |
Java_ContextualSearchManager_onSearchTermResolutionResponse( |
env, java_manager_, resolved_search_term.is_invalid, |
resolved_search_term.response_code, j_search_term, j_display_text, |