Autofill address and credit card data separately.

Our autofill UI for filling the billing address and credit card information
simultaneously quickly gets out of hand for users with multiple address and
credit card profiles.  We want a clean, simple UI; so we will just fill one
part of the form or the other; but not both.

This cl also removes the billing address drop down from the Autofill preferences "Add credit card" dialog.

BUG=57976
TEST=unit_tests --gtest_filter=*AutoFill*
     unit_tests --gtest_filter=*Autofill*

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

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

1 files changed, 2 insertions, 5 deletions

diff --git a/chrome/browser/autofill/autofill_common_test.cc b/chrome/browser/autofill/autofill_common_test.cc
index 3c7c319..c4c8482 100644
--- a/chrome/browser/autofill/autofill_common_test.cc
+++ b/chrome/browser/autofill/autofill_common_test.cc
@@ -55,16 +55,13 @@ void SetProfileInfo(AutoFillProfile* profile,
 }
 
 void SetCreditCardInfo(CreditCard* credit_card,
-    const char* label, const char* name_on_card, const char* type,
-    const char* card_number, const char* expiration_month,
-    const char* expiration_year, int billing_address_id) {
+    const char* label, const char* name_on_card, const char* card_number,
+    const char* expiration_month, const char* expiration_year) {
   credit_card->set_label(ASCIIToUTF16(label));
   check_and_set(credit_card, CREDIT_CARD_NAME, name_on_card);
-  check_and_set(credit_card, CREDIT_CARD_TYPE, type);
   check_and_set(credit_card, CREDIT_CARD_NUMBER, card_number);
   check_and_set(credit_card, CREDIT_CARD_EXP_MONTH, expiration_month);
   check_and_set(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR, expiration_year);
-  credit_card->set_billing_address_id(billing_address_id);
 }
 
 void DisableSystemServices(Profile* profile) {