[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/browser/account_tracker_service.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;
@@ skipping 820 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 (StartsWith(value_canon, field_contents_canon, true) ||
+          IsContentsPrefixOfSuggestionToken(values[i], field_contents, false)) {

[Evan Stade, 2015/05/22 18:26:48]

to match the naming format of StartsWith, can you make this
"ContainsTokenThatStartsWith"

also, why do you not use field_contents_canon and value_canon? I don't know if
it's correct or not, but it looks weirdly divergent from the line above, so if
it's correct you should justify it with a comment in the code.

[Pritam Nikam, 2015/05/25 18:14:51]

Done.
If we opt to use field_contents_canon and value_canon in
IsContentsPrefixOfSuggestionToken(), field_contents_canon holds canonicalize
input i.e. text having separators replaced with whitespace, and leads to
unexpected results.
For instance,
values[i]: "test@example.org" -> value_canon: "test example org"
field_contents: "exam...." -> field_contents_canon: "exam"

This 'll pass IsContentsPrefixOfSuggestionToken() and will bring
"test@example.org" in suggestions list, which seems wrong.

         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 54 matching lines @@
     // - the number matches any part of the card, or
     // - it's a masked card and there are 6 or fewers typed so far.
     // For other fields, require that the field contents match the beginning of
     // the stored data.
     if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
       if (creditcard_field_value.find(field_contents) == base::string16::npos &&
           (credit_card->record_type() != CreditCard::MASKED_SERVER_CARD ||
            field_contents.size() >= 6)) {
         continue;
       }
-    } else if (!StartsWith(creditcard_field_value, field_contents, false)) {
+    } else if (!StartsWith(creditcard_field_value, field_contents, false) &&
+               !IsContentsPrefixOfSuggestionToken(creditcard_field_value,
+                                                  field_contents, false)) {
       continue;
     }
 
     cards_to_suggest.push_back(credit_card);
   }
 
   // De-dupe card suggestions. Full server cards shadow local cards, and
   // local cards shadow masked server cards.
   for (auto outer_it = cards_to_suggest.begin();
        outer_it != cards_to_suggest.end();
@@ skipping 451 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill