Rename getSearchTerms as getText

chrome/browser/ui/android/toolbar/toolbar_model_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ToolbarModel_jni.h"
 
 using base::android::ScopedJavaLocalRef;
 
 ToolbarModelAndroid::ToolbarModelAndroid(JNIEnv* env, jobject jdelegate)
     : toolbar_model_(new ToolbarModelImpl(this)),
       weak_java_delegate_(env, jdelegate) {
 }
 
 ToolbarModelAndroid::~ToolbarModelAndroid() {
 }
 
 void ToolbarModelAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
-ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetSearchTerms(JNIEnv* env,
+ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetText(JNIEnv* env,
                                                                 jobject obj) {

[Ted C, 2014/05/12 20:16:39]

Just noticed the indenting of this is off now.

[Changwan Ryu, 2014/05/13 01:27:40]

Done.

   return base::android::ConvertUTF16ToJavaString(env,
                                                  toolbar_model_->GetText());
 }
 
 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetQueryExtractionParam(
     JNIEnv* env,
     jobject obj) {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return ScopedJavaLocalRef<jstring>();
@@ skipping 29 matching lines @@
 // static
 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 jlong Init(JNIEnv* env, jobject obj, jobject delegate) {
   ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
   return reinterpret_cast<intptr_t>(toolbar_model);
 }