[Autofill] Make PersonalDataManager::OverwriteWith case sensitive.

components/autofill/core/browser/autofill_profile.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/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
@@ skipping 469 matching lines @@
   }
 
   return true;
 }
 
 bool AutofillProfile::OverwriteName(const NameInfo& imported_name,
                                     const std::string& app_locale) {
   if (name_.ParsedNamesAreEqual(imported_name)) {
     if (name_.GetRawInfo(NAME_FULL).empty() &&
         !imported_name.GetRawInfo(NAME_FULL).empty()) {
       name_.SetRawInfo(NAME_FULL, imported_name.GetRawInfo(NAME_FULL));

[Mathieu, 2016/04/29 15:52:06]

let's make sure that if name_'s NAME_FULL is empty we fill it, below?

[sebsg, 2016/05/03 20:02:17]

Done.

       return true;
     }
     return false;
   }
 
   l10n::CaseInsensitiveCompare compare;
   AutofillType type = AutofillType(NAME_FULL);
   base::string16 full_name = name_.GetInfo(type, app_locale);
   if (compare.StringsEqual(full_name,
                            imported_name.GetInfo(type, app_locale))) {
@@ skipping 17 matching lines @@
 bool AutofillProfile::OverwriteWith(const AutofillProfile& profile,
                                     const std::string& app_locale) {
   // Verified profiles should never be overwritten with unverified data.
   DCHECK(!IsVerified() || profile.IsVerified());
   set_origin(profile.origin());
   set_language_code(profile.language_code());
   set_use_count(profile.use_count() + use_count());
   if (profile.use_date() > use_date())
     set_use_date(profile.use_date());
 
-  ServerFieldTypeSet field_types;
-  profile.GetNonEmptyTypes(app_locale, &field_types);
+  // |types_to_overwrite| is initially populated with all types that have
+  //  non-empty data in the incoming |profile|. After adjustment, all data from
+  // |profile| corresponding to types in |types_to_overwrite| is overwritten in
+  // |this| profile.
+  ServerFieldTypeSet types_to_overwrite;
+  profile.GetNonEmptyTypes(app_locale, &types_to_overwrite);
 
   // Only transfer "full" types (e.g. full name) and not fragments (e.g.
   // first name, last name).
-  CollapseCompoundFieldTypes(&field_types);
+  CollapseCompoundFieldTypes(&types_to_overwrite);
 
   // Remove ADDRESS_HOME_STREET_ADDRESS to ensure a merge of the address line by
   // line. See comment below.
-  field_types.erase(ADDRESS_HOME_STREET_ADDRESS);
+  types_to_overwrite.erase(ADDRESS_HOME_STREET_ADDRESS);
 
   l10n::CaseInsensitiveCompare compare;
 
   // Special case for addresses. With the whole address comparison, it is now
   // necessary to make sure to keep the best address format: both lines used.
   // This is because some sites might not have an address line 2 and the
   // previous value should not be replaced with an empty string in that case.
   if (compare.StringsEqual(
           CanonicalizeProfileString(
               profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)),
           CanonicalizeProfileString(GetRawInfo(ADDRESS_HOME_STREET_ADDRESS))) &&
       !GetRawInfo(ADDRESS_HOME_LINE2).empty() &&
       profile.GetRawInfo(ADDRESS_HOME_LINE2).empty()) {
-    field_types.erase(ADDRESS_HOME_LINE1);
-    field_types.erase(ADDRESS_HOME_LINE2);
+    types_to_overwrite.erase(ADDRESS_HOME_LINE1);
+    types_to_overwrite.erase(ADDRESS_HOME_LINE2);
   }
 
   bool did_overwrite = false;
 
-  for (ServerFieldTypeSet::const_iterator iter = field_types.begin();
-       iter != field_types.end(); ++iter) {
-    FieldTypeGroup group = AutofillType(*iter).group();
-
-    // Special case names.
-    if (group == NAME) {
-      did_overwrite = OverwriteName(profile.name_, app_locale) || did_overwrite;
+  for (ServerFieldTypeSet::const_iterator iter = types_to_overwrite.begin();

[Mathieu, 2016/04/29 15:52:06]

nit: can we use a range for loop?

for (const ServerFieldType& type : types_to_overwrite) ?

[sebsg, 2016/05/03 20:02:17]

Done.

+       iter != types_to_overwrite.end(); ++iter) {
+    // Special case for names.
+    if (AutofillType(*iter).group() == NAME) {
+      did_overwrite |= OverwriteName(profile.name_, app_locale);
       continue;
     }
 
     base::string16 new_value = profile.GetRawInfo(*iter);
-    if (!compare.StringsEqual(GetRawInfo(*iter), new_value)) {
+    // Overwrite the data in |this| profile for the field type and set
+    // |did_overwrite| if the previous data was different than the |new_value|.
+    if (GetRawInfo(*iter) != new_value) {
       SetRawInfo(*iter, new_value);
       did_overwrite = true;
     }
   }
 
   return did_overwrite;
 }
 
 bool AutofillProfile::SaveAdditionalInfo(const AutofillProfile& profile,
                                          const std::string& app_locale) {
@@ skipping 471 matching lines @@
             << " " << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)) << " "
             << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) << " "
             << profile.language_code() << " "
             << UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill