[Sync] Remove AutofillCreditCard specifics

BUG=
TEST=

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

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

chrome/browser/sync/protocol/autofill_specifics.proto

@@ -45,33 +45,6 @@ message AutofillProfileSpecifics {
   optional string phone_fax_whole_number = 14;
 }
 
-message AutofillCreditCardSpecifics {
-  // User-defined label (e.g. Amazon Visa).
-  optional string label = 1;
-
-  // The cardholder's name.
-  optional string name_on_card = 2;
-
-  // The type, e.g. Mastercard.
-  optional string type = 3;
-
-  // The credit card number.
-  optional string card_number = 4;
-
-  // The expiration.
-  optional string expiration_month = 5;
-  optional string expiration_year = 6;
-
-  // The CVV.
-  optional string verification_code = 7;
-
-  // The label of the Autofill profile that contains the billing address.
-  optional string billing_address = 8;
-
-  // The label of the Autofill profile that contains the shipping address.
-  optional string shipping_address = 9;
-}
-
 message AutofillSpecifics {
   // If any of these 3 fields are present, then all 3 should be, and it implies
   // that this entity represents a classic autofill object.  In this case,
@@ -85,16 +58,9 @@ message AutofillSpecifics {
   // name/value or credit_card) should be present.
   optional AutofillProfileSpecifics profile = 4;
 
-  // An AutofillCreditCardSpecifics, encryped using Nigori (see Chromium's
-  // base/nigori.h for details).  If present, indicates this entity represents
-  // an autofill++ CreditCard, and no other fields should be present.
-  // If encryption for autofill++ is not enabled, this is unused.  See
-  // |credit_card| in that case.
-  optional bytes encrypted_credit_card = 5;
-
-  // If encryption for autofill++ is not enabled, this field stores the
-  // AutofillCreditCardSpecifics [instead of |encrypted_credit_card|].
-  optional AutofillCreditCardSpecifics credit_card = 6;
+  // Obsolete credit card fields.
+  // optional bytes deprecated_encrypted_credit_card = 5;
+  // optional AutofillCreditCardSpecifics deprecated_credit_card = 6;
 }
 
 extend EntitySpecifics {

chrome/browser/sync/protocol/proto_value_conversions.cc

@@ -175,23 +175,6 @@ DictionaryValue* AutofillSpecificsToValue(
   SET_STR(value);
   SET_INT64_REP(usage_timestamp);
   SET(profile, AutofillProfileSpecificsToValue);
-  SET_BYTES(encrypted_credit_card);
-  SET(credit_card, AutofillCreditCardSpecificsToValue);
-  return value;
-}
-
-DictionaryValue* AutofillCreditCardSpecificsToValue(
-    const sync_pb::AutofillCreditCardSpecifics& proto) {
-  DictionaryValue* value = new DictionaryValue();
-  SET_STR(label);
-  SET_STR(name_on_card);
-  SET_STR(type);
-  SET_STR(card_number);
-  SET_STR(expiration_month);
-  SET_STR(expiration_year);
-  SET_STR(verification_code);
-  SET_STR(billing_address);
-  SET_STR(shipping_address);
   return value;
 }
 

chrome/browser/sync/protocol/proto_value_conversions.h

@@ -14,7 +14,6 @@ class DictionaryValue;
 
 namespace sync_pb {
 class AppSpecifics;
-class AutofillCreditCardSpecifics;
 class AutofillProfileSpecifics;
 class AutofillSpecifics;
 class BookmarkSpecifics;
@@ -80,10 +79,6 @@ base::DictionaryValue* AppSpecificsToValue(
 base::DictionaryValue* AutofillSpecificsToValue(
     const sync_pb::AutofillSpecifics& autofill_specifics);
 
-base::DictionaryValue* AutofillCreditCardSpecificsToValue(
-    const sync_pb::AutofillCreditCardSpecifics&
-        autofill_credit_card_specifics);
-
 base::DictionaryValue* AutofillProfileSpecificsToValue(
     const sync_pb::AutofillProfileSpecifics& autofill_profile_specifics);
 

chrome/browser/sync/protocol/proto_value_conversions_unittest.cc

@@ -91,10 +91,6 @@ TEST_F(ProtoValueConversionsTest, AutofillSpecificsToValue) {
   TestSpecificsToValue(AutofillSpecificsToValue);
 }
 
-TEST_F(ProtoValueConversionsTest, AutofillCreditCardSpecificsToValue) {
-  TestSpecificsToValue(AutofillCreditCardSpecificsToValue);
-}
-
 TEST_F(ProtoValueConversionsTest, AutofillProfileSpecificsToValue) {
   TestSpecificsToValue(AutofillProfileSpecificsToValue);
 }