[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 12 matching lines @@
 #include "components/autofill/core/browser/autofill_experiments.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 795 matching lines @@
   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;
 
       base::string16 value_canon =
           AutofillProfile::CanonicalizeProfileString(values[i]);
-      if (StartsWith(value_canon, field_contents_canon, true)) {
-        // Prefix match, add suggestion.
+      if (IsContentsPrefixOfSuggestionToken(values[i], field_contents, true) ||
+          StartsWith(value_canon, field_contents_canon, true)) {
         matched_profiles.push_back(profile);
         suggestions.push_back(Suggestion(values[i]));
         suggestions.back().backend_id.guid = profile->guid();
         suggestions.back().backend_id.variant = i;
       }
     }
   }
 
   // Don't show two suggestions if one is a subset of the other.
   std::vector<AutofillProfile*> unique_matched_profiles;
@@ skipping 516 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill