Add a method to retrieve the top synchronous suggestion.

chrome/browser/android/omnibox/autocomplete_controller_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/android/omnibox/autocomplete_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 97 matching lines @@
   // Nothing to do here, the results have been cached.
   // We don't want to trigger deletion here because this is being called by the
   // AutocompleteController object.
 }
 
 }  // namespace
 
 AutocompleteControllerAndroid::AutocompleteControllerAndroid(Profile* profile)
     : autocomplete_controller_(new AutocompleteController(
           profile, this, kAndroidAutocompleteProviders)),
-      inside_classify_(false),
+      inside_synchronous_start_(false),
       profile_(profile) {
 }
 
 void AutocompleteControllerAndroid::Start(JNIEnv* env,
                                           jobject obj,
                                           jstring j_text,
                                           jstring j_desired_tld,
                                           jstring j_current_url,
                                           bool prevent_inline_autocomplete,
                                           bool prefer_keyword,
@@ skipping 20 matching lines @@
                              prefer_keyword,
                              allow_exact_keyword_match,
                              want_asynchronous_matches);
   autocomplete_controller_->Start(input_);
 }
 
 ScopedJavaLocalRef<jobject> AutocompleteControllerAndroid::Classify(
     JNIEnv* env,
     jobject obj,
     jstring j_text) {
-  if (!autocomplete_controller_)
-    return ScopedJavaLocalRef<jobject>();
-
-  inside_classify_ = true;
-  Start(env, obj, j_text, NULL, NULL, true, false, false, false);
-  inside_classify_ = false;
-  DCHECK(autocomplete_controller_->done());
-  const AutocompleteResult& result = autocomplete_controller_->result();
-  if (result.empty())
-    return ScopedJavaLocalRef<jobject>();
-
-  return BuildOmniboxSuggestion(env, *result.begin());
+  return GetTopSynchronousResult(env, obj, j_text, true);
 }
 
 void AutocompleteControllerAndroid::StartZeroSuggest(
     JNIEnv* env,
     jobject obj,
     jstring j_omnibox_text,
     jstring j_current_url,
     jboolean is_query_in_omnibox,
     jboolean focused_from_fakebox) {
   if (!autocomplete_controller_)
@@ skipping 86 matching lines @@
     return ScopedJavaLocalRef<jstring>();
 
   AutocompleteMatch match(
       autocomplete_controller_->result().match_at(selected_index));
   autocomplete_controller_->UpdateMatchDestinationURL(
       base::TimeDelta::FromMilliseconds(elapsed_time_since_input_change),
       &match);
   return ConvertUTF8ToJavaString(env, match.destination_url.spec());
 }
 
+ScopedJavaLocalRef<jobject>
+AutocompleteControllerAndroid::GetTopSynchronousMatch(JNIEnv* env,
+                                                      jobject obj,
+                                                      jstring query) {
+  return GetTopSynchronousResult(env, obj, query, false);
+}
+
 void AutocompleteControllerAndroid::Shutdown() {
   autocomplete_controller_.reset();
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bridge =
       weak_java_autocomplete_controller_android_.get(env);
   if (java_bridge.obj())
     Java_AutocompleteController_notifyNativeDestroyed(env, java_bridge.obj());
 
   weak_java_autocomplete_controller_android_.reset();
@@ skipping 39 matching lines @@
 AutocompleteControllerAndroid::~AutocompleteControllerAndroid() {
 }
 
 void AutocompleteControllerAndroid::InitJNI(JNIEnv* env, jobject obj) {
   weak_java_autocomplete_controller_android_ =
       JavaObjectWeakGlobalRef(env, obj);
 }
 
 void AutocompleteControllerAndroid::OnResultChanged(
     bool default_match_changed) {
-  if (autocomplete_controller_.get() != NULL && !inside_classify_)
+  if (autocomplete_controller_.get() != NULL && !inside_synchronous_start_)
     NotifySuggestionsReceived(autocomplete_controller_->result());
 }
 
 void AutocompleteControllerAndroid::NotifySuggestionsReceived(
     const AutocompleteResult& autocomplete_result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bridge =
       weak_java_autocomplete_controller_android_.get(env);
   if (!java_bridge.obj())
     return;
@@ skipping 19 matching lines @@
       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);
 }
 
+AutocompleteInput::PageClassification
+AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl,
+                                            bool is_query_in_omnibox,
+                                            bool focused_from_fakebox) const {
+  if (!gurl.is_valid())
+    return AutocompleteInput::INVALID_SPEC;
+
+  const std::string& url = gurl.spec();

[David Trainor- moved to gerrit, 2014/06/06 01:20:39]

url(gurl.spec()) if it works w/ reference?

[Maria, 2014/06/06 01:27:55]

That's not necessary with reference. Since there's no new object being
constructed in this call, there's no need to do that.

I believe that's only useful to avoid constructing and then immediately
overwriting an object.

+
+  if (gurl.SchemeIs(content::kChromeUIScheme) &&

[David Trainor- moved to gerrit, 2014/06/06 01:20:39]

new line after each if block or no new lines imo (seems to vary)

[Maria, 2014/06/06 01:27:55]

Done.

+      gurl.host() == chrome::kChromeUINewTabHost) {
+    return AutocompleteInput::NTP;
+  }
+  if (url == chrome::kChromeUINativeNewTabURL) {
+    return focused_from_fakebox ?
+        AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
+        AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
+  }
+  if (url == content::kAboutBlankURL)
+    return AutocompleteInput::BLANK;
+
+  if (url == profile_->GetPrefs()->GetString(prefs::kHomePage))
+    return AutocompleteInput::HOME_PAGE;
+  if (is_query_in_omnibox)
+    return AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
+
+  bool is_search_url = TemplateURLServiceFactory::GetForProfile(profile_)->
+      IsSearchResultsPageFromDefaultSearchProvider(gurl);
+  if (is_search_url)
+    return AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
+  return AutocompleteInput::OTHER;
+}
+
 ScopedJavaLocalRef<jobject>
 AutocompleteControllerAndroid::BuildOmniboxSuggestion(
     JNIEnv* env,
     const AutocompleteMatch& match) {
   ScopedJavaLocalRef<jstring> contents =
       ConvertUTF16ToJavaString(env, match.contents);
   ScopedJavaLocalRef<jstring> description =
       ConvertUTF16ToJavaString(env, match.description);
   ScopedJavaLocalRef<jstring> answer_contents =
       ConvertUTF16ToJavaString(env, match.answer_contents);
@@ skipping 27 matching lines @@
   if (profile_ == NULL)
     return base::string16();
 
   std::string languages(
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
 
   return net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
       net::UnescapeRule::SPACES, NULL, NULL, NULL);
 }
 
-AutocompleteInput::PageClassification
-AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl,
-                                            bool is_query_in_omnibox,
-                                            bool focused_from_fakebox) const {
-  if (!gurl.is_valid())
-    return AutocompleteInput::INVALID_SPEC;
+ScopedJavaLocalRef<jobject>
+AutocompleteControllerAndroid::GetTopSynchronousResult(
+    JNIEnv* env,
+    jobject obj,
+    jstring j_text,
+    bool prevent_inline_autocomplete) {
+  if (!autocomplete_controller_)
+    return ScopedJavaLocalRef<jobject>();
 
-  const std::string& url = gurl.spec();
+  inside_synchronous_start_ = true;
+  Start(env, obj, j_text, NULL, NULL, prevent_inline_autocomplete, false, false,

[David Trainor- moved to gerrit, 2014/06/06 01:20:39]

each param on it's own line if they don't fit on a new line

[Maria, 2014/06/06 01:27:55]

Done.

GRRR. Have I mentioned to anyone lately how much I hate doing 1 param per line
style in calls with 10 parameters?

+        false);
+  inside_synchronous_start_ = false;
+  DCHECK(autocomplete_controller_->done());
+  const AutocompleteResult& result = autocomplete_controller_->result();
+  if (result.empty())
+    return ScopedJavaLocalRef<jobject>();
 
-  if (gurl.SchemeIs(content::kChromeUIScheme) &&
-      gurl.host() == chrome::kChromeUINewTabHost) {
-    return AutocompleteInput::NTP;
-  }
-  if (url == chrome::kChromeUINativeNewTabURL) {
-    return focused_from_fakebox ?
-        AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS :
-        AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS;
-  }
-  if (url == content::kAboutBlankURL)
-    return AutocompleteInput::BLANK;
-
-  if (url == profile_->GetPrefs()->GetString(prefs::kHomePage))
-    return AutocompleteInput::HOME_PAGE;
-  if (is_query_in_omnibox)
-    return AutocompleteInput::SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT;
-
-  bool is_search_url = TemplateURLServiceFactory::GetForProfile(profile_)->
-      IsSearchResultsPageFromDefaultSearchProvider(gurl);
-  if (is_search_url)
-    return AutocompleteInput::SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT;
-  return AutocompleteInput::OTHER;
+  return BuildOmniboxSuggestion(env, *result.begin());
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   if (!profile)
     return 0;
 
   AutocompleteControllerAndroid* native_bridge =
       AutocompleteControllerAndroid::Factory::GetForProfile(profile, env, obj);
   return reinterpret_cast<intptr_t>(native_bridge);
@@ skipping 35 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }