ToolbarModel::GetText() returns not only search terms but also formatted URL.

Android does not use location_bar_view but its own LocationBarView, and this
still requires access to ToolbarModel::GetText() to show formatted URL
to its users. We need to reuse GetText() to get formatted URL.
    
BUG=365567,293227

Review URL: https://codereview.chromium.org/251983002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270027 0039d316-1c4b-4281-b951-d872f2087c98

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java

@@ -42,10 +42,10 @@ public class ToolbarModel {
         mNativeToolbarModelAndroid = 0;
     }
 
-    /** @return The search terms extracted from the current url if query extraction is enabled. */
-    public String getSearchTerms() {
+    /** @return The formatted text (URL or search terms) for display. */
+    public String getText() {
         if (mNativeToolbarModelAndroid == 0) return null;
-        return nativeGetSearchTerms(mNativeToolbarModelAndroid);
+        return nativeGetText(mNativeToolbarModelAndroid);
     }
 
     /** @return The parameter in the url that triggers query extraction. */
@@ -62,7 +62,7 @@ public class ToolbarModel {
 
     private native long nativeInit(ToolbarModelDelegate delegate);
     private native void nativeDestroy(long nativeToolbarModelAndroid);
-    private native String nativeGetSearchTerms(long nativeToolbarModelAndroid);
+    private native String nativeGetText(long nativeToolbarModelAndroid);
     private native String nativeGetQueryExtractionParam(long nativeToolbarModelAndroid);
     private native String nativeGetCorpusChipText(long nativeToolbarModelAndroid);
 }

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

@@ -26,8 +26,8 @@ void ToolbarModelAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
-ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetSearchTerms(JNIEnv* env,
-                                                                jobject obj) {
+ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetText(JNIEnv* env,
+                                                         jobject obj) {
   return base::android::ConvertUTF16ToJavaString(env,
                                                  toolbar_model_->GetText());
 }

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

@@ -24,7 +24,7 @@ class ToolbarModelAndroid : public ToolbarModelDelegate {
   virtual ~ToolbarModelAndroid();
 
   void Destroy(JNIEnv* env, jobject obj);
-  base::android::ScopedJavaLocalRef<jstring> GetSearchTerms(
+  base::android::ScopedJavaLocalRef<jstring> GetText(
       JNIEnv* env,
       jobject obj);
   base::android::ScopedJavaLocalRef<jstring> GetQueryExtractionParam(