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 23 matching lines @@
   autocomplete_controller_->Start(input_);
 }
 
 ScopedJavaLocalRef<jobject> AutocompleteControllerAndroid::Classify(
     JNIEnv* env,
     jobject obj,
     jstring j_text) {
   if (!autocomplete_controller_)
     return ScopedJavaLocalRef<jobject>();
 
-  inside_classify_ = true;
+  inside_synchronous_start_ = true;
   Start(env, obj, j_text, NULL, NULL, true, false, false, false);
-  inside_classify_ = false;
+  inside_synchronous_start_ = false;
   DCHECK(autocomplete_controller_->done());
   const AutocompleteResult& result = autocomplete_controller_->result();
   if (result.empty())
     return ScopedJavaLocalRef<jobject>();
 
   return BuildOmniboxSuggestion(env, *result.begin());
 }
 
 void AutocompleteControllerAndroid::StartZeroSuggest(
     JNIEnv* env,
@@ skipping 92 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,

[Yusuf, 2014/06/05 21:56:06]

One question is the difference between this and classify. Can they share a bit
more code? It looks like there is one boolean flag that is different and one
just calls start with the initial input params and the other constructs the
input object and sends this to start.

Can we do most of this in a private shared method and pass one or two params to
control?

+                                                      jobject obj,
+                                                      jstring query) {
+  if (!autocomplete_controller_)
+    return ScopedJavaLocalRef<jobject>();
+
+  base::string16 text(ConvertJavaStringToUTF16(env, query));
+  // Request synchronous matches only.
+  AutocompleteInput input(text,
+                          base::string16::npos,
+                          base::string16(),
+                          GURL(),
+                          AutocompleteInput::INVALID_SPEC,
+                          false,
+                          false,
+                          false,
+                          false);
+  inside_synchronous_start_ = true;
+  autocomplete_controller_->Start(input);
+  inside_synchronous_start_ = false;
+  DCHECK(autocomplete_controller_->done());
+  const AutocompleteResult& result = autocomplete_controller_->result();
+  if (result.empty())
+    return ScopedJavaLocalRef<jobject>();
+
+  return BuildOmniboxSuggestion(env, *result.begin());
+}
+
 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 152 matching lines @@
     return;
 
   // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
   new ZeroSuggestPrefetcher(profile);
 }
 
 // Register native methods
 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }