Revert 81421 - Looks to have broken unittest, see http://chromegw.corp.google.com/i/chromium/builders/Vista%20Tests%20%28dbg%29%281%29/builds/8263/steps/unit_tests/logs/TestLongSafePureFilenameRevert 81416 - Autofill extend profiles to include multi-valued fields, part 6 (Aggregation)Extends the Autofill aggregation logic to merge profiles with a common address into a single profile with multi-valued fields. Also, extends the web_database migration to include this new logic when migrating the web_database preferences.BUG=65625TEST=WebDatabaseMigrationTest.MigrateVersion32ToCurrent:AutofillMergeTest.DataDrivenMergeProfiles:AutofillProfileTest.*Review URL: http://codereview.chromium.org/6826059TBR=dhollowa@chromium.orgReview URL: http://codereview.chromium.org/6833026

TBR=siggi@chromium.org
Review URL: http://codereview.chromium.org/6834028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81425 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 128 insertions, 18 deletions

diff --git a/chrome/test/data/autofill/merge/input/ambiguous.in b/chrome/test/data/autofill/merge/input/ambiguous.in
new file mode 100644
index 0000000..afd96443
--- /dev/null
+++ b/chrome/test/data/autofill/merge/input/ambiguous.in
@@ -0,0 +1,21 @@
+---
+NAME_FIRST: John
+NAME_FIRST: James
+NAME_MIDDLE: Kilgore
+NAME_MIDDLE: 
+NAME_LAST: Doe
+NAME_LAST: 
+EMAIL_ADDRESS: john.doe@example.com
+EMAIL_ADDRESS: x.doe@example.com
+COMPANY_NAME: TestCo
+ADDRESS_HOME_LINE1: 1600 Amphitheatre Parkway
+ADDRESS_HOME_LINE2: (Bldg. 1950)
+ADDRESS_HOME_CITY: Mountain View
+ADDRESS_HOME_STATE: CA
+ADDRESS_HOME_ZIP: 94043
+ADDRESS_HOME_COUNTRY: United States
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_HOME_WHOLE_NUMBER: 6505559999
+PHONE_HOME_WHOLE_NUMBER: 6505559999
+PHONE_FAX_WHOLE_NUMBER: 6505556789
+PHONE_FAX_WHOLE_NUMBER: 6505551111
diff --git a/chrome/test/data/autofill/merge/input/identical.in b/chrome/test/data/autofill/merge/input/identical.in
index 0d45be4..6e1c6bc7 100644
--- a/chrome/test/data/autofill/merge/input/identical.in
+++ b/chrome/test/data/autofill/merge/input/identical.in
@@ -10,8 +10,8 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
 ---
 NAME_FIRST: John
 NAME_MIDDLE: Kilgore
@@ -24,5 +24,5 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
diff --git a/chrome/test/data/autofill/merge/input/multimerge.in b/chrome/test/data/autofill/merge/input/multimerge.in
new file mode 100644
index 0000000..9906c27
--- /dev/null
+++ b/chrome/test/data/autofill/merge/input/multimerge.in
@@ -0,0 +1,28 @@
+---
+NAME_FIRST: Alice
+NAME_MIDDLE: Anne
+NAME_LAST: Akins
+EMAIL_ADDRESS: aa@a.com
+COMPANY_NAME: Acme
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 1
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: CA
+ADDRESS_HOME_ZIP: 94102
+ADDRESS_HOME_COUNTRY: United States
+PHONE_HOME_WHOLE_NUMBER: 1110001111
+PHONE_FAX_WHOLE_NUMBER: 8880008888
+---
+NAME_FIRST: Billy
+NAME_MIDDLE: Bob
+NAME_LAST: Bruner
+EMAIL_ADDRESS: bb@b.com
+COMPANY_NAME: Acme
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 1
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: CA
+ADDRESS_HOME_ZIP: 94102
+ADDRESS_HOME_COUNTRY: United States
+PHONE_HOME_WHOLE_NUMBER: 2220003333
+PHONE_FAX_WHOLE_NUMBER: 8880008888
diff --git a/chrome/test/data/autofill/merge/input/singlemerge.in b/chrome/test/data/autofill/merge/input/singlemerge.in
new file mode 100644
index 0000000..f264015
--- /dev/null
+++ b/chrome/test/data/autofill/merge/input/singlemerge.in
@@ -0,0 +1,28 @@
+---
+NAME_FIRST: Alice
+NAME_MIDDLE: Anne
+NAME_LAST: Akins
+EMAIL_ADDRESS: aa@a.com
+COMPANY_NAME: Acme
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 1
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: CA
+ADDRESS_HOME_ZIP: 94102
+ADDRESS_HOME_COUNTRY: United States
+PHONE_HOME_WHOLE_NUMBER: 1110001111
+PHONE_FAX_WHOLE_NUMBER: 8880008888
+---
+NAME_FIRST: Alice
+NAME_MIDDLE: Anne
+NAME_LAST: Akins
+EMAIL_ADDRESS: aa@a.com
+COMPANY_NAME: Box Co
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 2
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: NY
+ADDRESS_HOME_ZIP: 11001
+ADDRESS_HOME_COUNTRY: Canada
+PHONE_HOME_WHOLE_NUMBER: 1110001111
+PHONE_FAX_WHOLE_NUMBER: 8880008888
diff --git a/chrome/test/data/autofill/merge/input/validation.in b/chrome/test/data/autofill/merge/input/validation.in
index 32ed1a8..f148032 100644
--- a/chrome/test/data/autofill/merge/input/validation.in
+++ b/chrome/test/data/autofill/merge/input/validation.in
@@ -9,8 +9,8 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
 ---
 NAME_FIRST: John
 NAME_LAST: Doe
@@ -20,8 +20,8 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
 ---
 NAME_FIRST: Jim
 NAME_LAST: Smith
@@ -49,8 +49,8 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: Bad Country
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
 ---
 NAME_FIRST: Joe
 NAME_LAST: Jones
@@ -61,8 +61,8 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: BadState
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
 ---
 NAME_FIRST: Jim
 NAME_LAST: Jones
@@ -73,5 +73,5 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: bogus
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
diff --git a/chrome/test/data/autofill/merge/output/ambiguous.out b/chrome/test/data/autofill/merge/output/ambiguous.out
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/test/data/autofill/merge/output/ambiguous.out
diff --git a/chrome/test/data/autofill/merge/output/identical.out b/chrome/test/data/autofill/merge/output/identical.out
index 5ddb88c..8c6fb81 100644
--- a/chrome/test/data/autofill/merge/output/identical.out
+++ b/chrome/test/data/autofill/merge/output/identical.out
@@ -10,5 +10,5 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789
diff --git a/chrome/test/data/autofill/merge/output/multimerge.out b/chrome/test/data/autofill/merge/output/multimerge.out
new file mode 100644
index 0000000..260f8bb
--- /dev/null
+++ b/chrome/test/data/autofill/merge/output/multimerge.out
@@ -0,0 +1,19 @@
+---
+NAME_FIRST: Alice
+NAME_FIRST: Billy
+NAME_MIDDLE: Anne
+NAME_MIDDLE: Bob
+NAME_LAST: Akins
+NAME_LAST: Bruner
+EMAIL_ADDRESS: aa@a.com
+EMAIL_ADDRESS: bb@b.com
+COMPANY_NAME: Acme
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 1
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: CA
+ADDRESS_HOME_ZIP: 94102
+ADDRESS_HOME_COUNTRY: United States
+PHONE_HOME_WHOLE_NUMBER: 1110001111
+PHONE_HOME_WHOLE_NUMBER: 2220003333
+PHONE_FAX_WHOLE_NUMBER: 8880008888
diff --git a/chrome/test/data/autofill/merge/output/singlemerge.out b/chrome/test/data/autofill/merge/output/singlemerge.out
new file mode 100644
index 0000000..3181458
--- /dev/null
+++ b/chrome/test/data/autofill/merge/output/singlemerge.out
@@ -0,0 +1,14 @@
+---
+NAME_FIRST: Alice
+NAME_MIDDLE: Anne
+NAME_LAST: Akins
+EMAIL_ADDRESS: aa@a.com
+COMPANY_NAME: Box Co
+ADDRESS_HOME_LINE1: 1 Main Street
+ADDRESS_HOME_LINE2: Apt 2
+ADDRESS_HOME_CITY: San Francisco
+ADDRESS_HOME_STATE: NY
+ADDRESS_HOME_ZIP: 11001
+ADDRESS_HOME_COUNTRY: Canada
+PHONE_HOME_WHOLE_NUMBER: 1110001111
+PHONE_FAX_WHOLE_NUMBER: 8880008888
diff --git a/chrome/test/data/autofill/merge/output/validation.out b/chrome/test/data/autofill/merge/output/validation.out
index cc3c080..2925154 100644
--- a/chrome/test/data/autofill/merge/output/validation.out
+++ b/chrome/test/data/autofill/merge/output/validation.out
@@ -10,5 +10,5 @@ ADDRESS_HOME_CITY: Mountain View
 ADDRESS_HOME_STATE: CA
 ADDRESS_HOME_ZIP: 94043
 ADDRESS_HOME_COUNTRY: United States
-PHONE_HOME_NUMBER: 6505558888
-PHONE_FAX_NUMBER: 6505556789
+PHONE_HOME_WHOLE_NUMBER: 6505558888
+PHONE_FAX_WHOLE_NUMBER: 6505556789