[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 781 matching lines @@
         }
       }
     }
 
     return suggestions;
   }
 
   std::vector<Suggestion> suggestions;
   // Match based on a prefix search.
   std::vector<AutofillProfile*> matched_profiles;
+  std::vector<AutofillProfile*> substring_matched_profiles;
+  std::vector<base::string16> multi_values_for_substrings;
+  size_t prefix_match = 0;
   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]);
+      // Order |profile|s with pre-fix before sub-string match.

[Evan Stade, 2015/03/24 00:48:26]

prefix, not pre-fix
substring, not sub-string

[Pritam Nikam, 2015/03/24 11:39:36]

Done.

       if (StartsWith(value_canon, field_contents_canon, true)) {
         // Prefix match, add suggestion.
         matched_profiles.push_back(profile);
         suggestions.push_back(Suggestion(values[i]));
         suggestions.back().backend_id.guid = profile->guid();
         suggestions.back().backend_id.variant = i;
+        ++prefix_match;
+      } else if (IsFeatureSubStringMatchEnabled() &&

[Evan Stade, 2015/03/24 00:48:26]

Substring (not SubString)

[Pritam Nikam, 2015/03/24 11:39:36]

Done.

+                 HasTokoneStartsWith(value_canon, field_contents_canon)) {
+        substring_matched_profiles.push_back(profile);

[Evan Stade, 2015/03/24 00:48:26]

add a field to Suggestion to indicate if it's a prefix match, sort suggestions 

[Pritam Nikam, 2015/03/24 11:39:36]

Done.

+        multi_values_for_substrings.push_back(values[i]);
       }
     }
   }
 
+  // Now append profiles having sub-string matching.
+  for (size_t k = 0; k < substring_matched_profiles.size(); k++) {
+    matched_profiles.push_back(substring_matched_profiles[k]);
+    suggestions.push_back(Suggestion(multi_values_for_substrings[k]));
+    suggestions.back().backend_id.guid = substring_matched_profiles[k]->guid();
+    suggestions.back().backend_id.variant = k + prefix_match;

[Evan Stade, 2015/03/24 00:48:26]

I do not understand this line at all

[Pritam Nikam, 2015/03/24 11:39:36]

substring matched suggestion's |backend_id.variant| are assigned with next index
in the suggestion list.

+  }
+
   // 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 504 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill