Revert 70967 - Full refactor and rewrite of the autofill sync integration tests

Reason for revert: Need to merge with patches that slipped in before this.

The autofill sync integration tests were written more than a year ago,
and are pretty badly out of date. In addition, the autofill test
framework is crufty and adding new tests is not intuitive.

The autofill sync code has recently undergone a major refactor, and so
it is time to update the integration test code too. This patch contains
a major update of the LiveAutofillSyncTest class and a rewrite of most
of the autofill sync tests.

BUG=62913, 60368
TEST=sync_integration_tests

Review URL: http://codereview.chromium.org/6163001

TBR=rsimha@chromium.org
Review URL: http://codereview.chromium.org/6166006

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

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index 7bbb29a..075cf47 100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
@@ -154,7 +154,7 @@ std::string ModelTypeToString(ModelType model_type) {
     case APPS:
       return "Apps";
     case AUTOFILL_PROFILE:
-      return "Autofill Profile";
+      return "Autofill Profiles";
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
@@ -171,6 +171,8 @@ ModelType ModelTypeFromString(const std::string& model_type_string) {
     return PASSWORDS;
   else if (model_type_string == "Autofill")
     return AUTOFILL;
+  else if (model_type_string == "Autofill Profiles")
+    return AUTOFILL_PROFILE;
   else if (model_type_string == "Themes")
     return THEMES;
   else if (model_type_string == "Typed URLs")
@@ -226,6 +228,10 @@ void PostTimeToTypeHistogram(ModelType model_type, base::TimeDelta time) {
         SYNC_FREQ_HISTOGRAM("Sync.FreqAutofill", time);
         return;
     }
+    case AUTOFILL_PROFILE: {
+        SYNC_FREQ_HISTOGRAM("Sync.FreqAutofillProfiles", time);
+        return;
+    }
     case THEMES: {
         SYNC_FREQ_HISTOGRAM("Sync.FreqThemes", time);
         return;