[Autofill/Autocomplete Feature] Substring matching instead of prefix matching.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 11 matching lines @@
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
+#include "components/autofill/core/common/autofill_util.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
 
 namespace autofill {
 namespace {
 
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::GetStreetAddressLinesAsSingleLine;
 using ::i18n::addressinput::STREET_ADDRESS;
@@ skipping 180 matching lines @@
 // which is probably not what we want. TODO(estade): figure out relative ranking
 // of server data.
 bool RankByMfu(const AutofillDataModel* a, const AutofillDataModel* b) {
   if (a->use_count() != b->use_count())
     return a->use_count() > b->use_count();
 
   // Ties are broken by MRU.
   return a->use_date() > b->use_date();
 }
 
+// Helper function to order prefix matched suggestions prior to substring
+// matched.
+bool OrderPrefixBeforeSubstring(const Suggestion& suggestion1,
+                                const Suggestion& suggestion2) {
+  return suggestion1.match < suggestion2.match;
+}
+
 }  // namespace
 
 PersonalDataManager::PersonalDataManager(const std::string& app_locale)
     : database_(NULL),
       is_data_loaded_(false),
       pending_profiles_query_(0),
       pending_server_profiles_query_(0),
       pending_creditcards_query_(0),
       pending_server_creditcards_query_(0),
       app_locale_(app_locale),
@@ skipping 588 matching lines @@
   std::vector<Suggestion> suggestions;
   // Match based on a prefix search.
   std::vector<AutofillProfile*> matched_profiles;
   for (AutofillProfile* profile : profiles) {
     std::vector<base::string16> values =
         GetMultiInfoInOneLine(profile, type, app_locale_);
     for (size_t i = 0; i < values.size(); i++) {
       if (values[i].empty())
         continue;
 
+      bool substring_token_matched = false;
       base::string16 value_canon =
           AutofillProfile::CanonicalizeProfileString(values[i]);
-      if (StartsWith(value_canon, field_contents_canon, true)) {
-        // Prefix match, add suggestion.
+      if (StartsWith(value_canon, field_contents_canon, true) ||
+          (substring_token_matched =
+               IsFeatureSubstringMatchEnabled() &&
+               IsContentsPrefixOfSuggestionToken(
+                   value_canon, field_contents_canon, CASE_SENSITIVE))) {
         matched_profiles.push_back(profile);
         suggestions.push_back(Suggestion(values[i]));
         suggestions.back().backend_id.guid = profile->guid();
         suggestions.back().backend_id.variant = i;
+        suggestions.back().match = substring_token_matched
+                                       ? Suggestion::SUBSTRING_MATCH
+                                       : Suggestion::PREFIX_MATCH;
       }
     }
   }
 
+  // Now sort profiles with prefix matched suggestions order before substring
+  // matched suggestions.
+  std::sort(suggestions.begin(), suggestions.end(), OrderPrefixBeforeSubstring);
+
   // Don't show two suggestions if one is a subset of the other.
   std::vector<AutofillProfile*> unique_matched_profiles;
   std::vector<Suggestion> unique_suggestions;
   ServerFieldTypeSet types(other_field_types.begin(), other_field_types.end());
   for (size_t i = 0; i < matched_profiles.size(); ++i) {
     bool include = true;
     AutofillProfile* profile_a = matched_profiles[i];
     for (size_t j = 0; j < matched_profiles.size(); ++j) {
       AutofillProfile* profile_b = matched_profiles[j];
       // Check if profile A is a subset of profile B. If not, continue.
@@ skipping 509 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill