Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/autofill_merge_unittest.cc

Index: components/autofill/core/browser/autofill_merge_unittest.cc
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 3b944a18031374048ee1c838e766fad451f9e572..60d08510a3101c52318a974997b7d65bc58f4334 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -38,9 +38,8 @@ 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,
@@ -96,13 +95,17 @@ std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
       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;
 }
 
@@ -239,8 +242,11 @@ void AutofillMergeTest::MergeProfiles(const std::string& profiles,
           << "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"));