Revert of [autofill] Sync server card and address metadata.

components/autofill/core/browser/webdata/autofill_change.cc

Index: components/autofill/core/browser/webdata/autofill_change.cc
diff --git a/components/autofill/core/browser/webdata/autofill_change.cc b/components/autofill/core/browser/webdata/autofill_change.cc
index 2d2ff6742b0a622c3ddf9702ea7be4414beb6244..c02bdd8464d8476d974f1cfd0a04e2c60f55af10 100644
--- a/components/autofill/core/browser/webdata/autofill_change.cc
+++ b/components/autofill/core/browser/webdata/autofill_change.cc
@@ -17,11 +17,13 @@
 AutofillChange::~AutofillChange() {
 }
 
-AutofillProfileChange::AutofillProfileChange(Type type,
-                                             const std::string& key,
-                                             const AutofillProfile* profile)
-    : GenericAutofillChange<std::string>(type, key), profile_(profile) {
-  DCHECK(type == REMOVE ? !profile : profile && profile->guid() == key);
+AutofillProfileChange::AutofillProfileChange(
+  Type type, const std::string& key, const AutofillProfile* profile)
+    : GenericAutofillChange<std::string>(type, key),
+      profile_(profile) {
+  DCHECK(type == ADD ? (profile && profile->guid() == key) : true);
+  DCHECK(type == UPDATE ? (profile && profile->guid() == key) : true);
+  DCHECK(type == REMOVE ? !profile : true);
 }
 
 AutofillProfileChange::~AutofillProfileChange() {
@@ -29,23 +31,9 @@
 
 bool AutofillProfileChange::operator==(
     const AutofillProfileChange& change) const {
-  return type() == change.type() && key() == change.key() &&
-         (type() == REMOVE || *profile() == *change.profile());
-}
-
-CreditCardChange::CreditCardChange(Type type,
-                                   const std::string& key,
-                                   const CreditCard* card)
-    : GenericAutofillChange<std::string>(type, key), card_(card) {
-  DCHECK(type == REMOVE ? !card : card && card->guid() == key);
-}
-
-CreditCardChange::~CreditCardChange() {
-}
-
-bool CreditCardChange::operator==(const CreditCardChange& change) const {
-  return type() == change.type() && key() == change.key() &&
-         (type() == REMOVE || *card() == *change.card());
+  return type() == change.type() &&
+         key() == change.key() &&
+         (type() != REMOVE) ? *profile() == *change.profile() : true;
 }
 
 }  // namespace autofill