Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/autofill_merge_unittest.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 <stddef.h>
 
 #include <map>
 #include <memory>
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "base/mac/foundation_util.h"
 #endif
 
 namespace autofill {
 
 namespace {
 
 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
 const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
 
-const char kFieldSeparator[] = ": ";
+const char kFieldSeparator[] = ":";
 const char kProfileSeparator[] = "---";
-const size_t kFieldOffset = arraysize(kFieldSeparator) - 1;
 
 const ServerFieldType kProfileFieldTypes[] = {NAME_FIRST,
                                               NAME_MIDDLE,
                                               NAME_LAST,
                                               NAME_FULL,
                                               EMAIL_ADDRESS,
                                               COMPANY_NAME,
                                               ADDRESS_HOME_STREET_ADDRESS,
                                               ADDRESS_HOME_CITY,
                                               ADDRESS_HOME_STATE,
@@ skipping 35 matching lines @@
 std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
   std::string result;
   for (size_t i = 0; i < profiles.size(); ++i) {
     result += kProfileSeparator;
     result += "\n";
     for (size_t j = 0; j < arraysize(kProfileFieldTypes); ++j) {
       ServerFieldType type = kProfileFieldTypes[j];
       base::string16 value = profiles[i]->GetRawInfo(type);
       result += AutofillType(type).ToString();
       result += kFieldSeparator;
-      base::ReplaceFirstSubstringAfterOffset(
-          &value, 0, base::ASCIIToUTF16("\\n"), base::ASCIIToUTF16("\n"));
-      result += base::UTF16ToUTF8(value);
+      if (!value.empty()) {

[Mathieu, 2016/06/29 15:50:56]

You will probably need to update
https://cs.chromium.org/chromium/src/components/test/data/autofill/merge/tool....


Something like:
lines.append("%s:%s" % (field_type, " " + value if value else ""))

[Roger McFarlane (Chromium), 2016/06/29 18:21:36]

Done.

+        base::ReplaceFirstSubstringAfterOffset(
+            &value, 0, base::ASCIIToUTF16("\\n"), base::ASCIIToUTF16("\n"));
+        result += " ";
+        result += base::UTF16ToUTF8(value);
+      }
       result += "\n";
     }
   }
 
+

[sebsg, 2016/06/29 08:57:03]

nit: remove second whitespace.

[Roger McFarlane (Chromium), 2016/06/29 18:21:36]

Done.

   return result;
 }
 
 class PersonalDataManagerMock : public PersonalDataManager {
  public:
   PersonalDataManagerMock();
   ~PersonalDataManagerMock() override;
 
   // Reset the saved profiles.
   void Reset();
@@ skipping 116 matching lines @@
       profiles, "\n", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   for (size_t i = 0; i < lines.size(); ++i) {
     std::string line = lines[i];
     if (line != kProfileSeparator) {
       // Add a field to the current profile.
       size_t separator_pos = line.find(kFieldSeparator);
       ASSERT_NE(std::string::npos, separator_pos)
           << "Wrong format for separator on line " << i;
       base::string16 field_type =
           base::UTF8ToUTF16(line.substr(0, separator_pos));
+      do {
+        ++separator_pos;
+      } while (separator_pos < line.size() && line[separator_pos] == ' ');
       base::string16 value =
-          base::UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
+          base::UTF8ToUTF16(line.substr(separator_pos));
       base::ReplaceFirstSubstringAfterOffset(
           &value, 0, base::ASCIIToUTF16("\\n"), base::ASCIIToUTF16("\n"));
 
       FormFieldData field;
       field.label = field_type;
       field.name = field_type;
       field.value = value;
       field.form_control_type = "text";
       field.is_focusable = true;
       form.fields.push_back(field);
@@ skipping 33 matching lines @@
   return string_to_field_type_map_[str];
 }
 
 TEST_P(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunOneDataDrivenTest(GetParam(), GetOutputDirectory(kTestName));
 }
 
 INSTANTIATE_TEST_CASE_P(, AutofillMergeTest, testing::ValuesIn(GetTestFiles()));
 
 }  // namespace autofill