AutoFill: Aggregate profile data. Remove the AutoFill InfoBar. Remove more remnants of shipping address and CVV.

BUG=47426,47423
TEST=PersonalDataManager.*

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

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

2 files changed, 8 insertions, 25 deletions

diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 870d2d7..5bc985f 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -1567,16 +1567,17 @@ static void BindCreditCardToStatement(const CreditCard& credit_card,
   text.clear();
   s->BindString16(7, text);
   s->BindString16(8, credit_card.billing_address());
-  s->BindString16(9, credit_card.shipping_address());
+  // We don't store the shipping address anymore.
+  text.clear();
+  s->BindString16(9, text);
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NUMBER));
   std::string encrypted_data;
   Encryptor::EncryptString16(text, &encrypted_data);
   s->BindBlob(10, encrypted_data.data(),
               static_cast<int>(encrypted_data.length()));
-  text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_VERIFICATION_CODE));
-  Encryptor::EncryptString16(text, &encrypted_data);
-  s->BindBlob(11, encrypted_data.data(),
-              static_cast<int>(encrypted_data.length()));
+  // We don't store the CVV anymore.
+  text.clear();
+  s->BindBlob(11, text.data(), static_cast<int>(text.length()));
 }
 
 bool WebDatabase::AddCreditCard(const CreditCard& credit_card) {
@@ -1628,21 +1629,9 @@ static CreditCard* CreditCardFromStatement(const sql::Statement& s) {
                        s.ColumnString16(6));
 
   string16 credit_card_verification_code = s.ColumnString16(7);
-  // It could be non-empty prior to version 23. After that it encrypted in
-  // the column 11.
-  if (credit_card_verification_code.empty()) {
-    int encrypted_cc_len = s.ColumnByteLength(11);
-    std::string encrypted_cc;
-    if (encrypted_cc_len) {
-      encrypted_cc.resize(encrypted_cc_len);
-      memcpy(&encrypted_cc[0], s.ColumnBlob(11), encrypted_cc_len);
-      Encryptor::DecryptString16(encrypted_cc, &credit_card_verification_code);
-    }
-  }
-  credit_card->SetInfo(AutoFillType(CREDIT_CARD_VERIFICATION_CODE),
-                       credit_card_verification_code);
+  // We don't store the CVV anymore.
   credit_card->set_billing_address(s.ColumnString16(8));
-  credit_card->set_shipping_address(s.ColumnString16(9));
+  // We don't store the shipping address anymore.
   // Column 10 is processed above.
   // Column 11 is processed above.
 
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 3d3d1cf9..6464f39 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -1177,10 +1177,7 @@ TEST_F(WebDatabaseTest, CreditCard) {
                           ASCIIToUTF16("04"));
   work_creditcard.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                           ASCIIToUTF16("2013"));
-  work_creditcard.SetInfo(AutoFillType(CREDIT_CARD_VERIFICATION_CODE),
-                          ASCIIToUTF16("987"));
   work_creditcard.set_billing_address(ASCIIToUTF16("Overlook Hotel"));
-  work_creditcard.set_shipping_address(ASCIIToUTF16("Timberline Lodge"));
 
   EXPECT_TRUE(db.AddCreditCard(work_creditcard));
 
@@ -1202,10 +1199,7 @@ TEST_F(WebDatabaseTest, CreditCard) {
                             ASCIIToUTF16("06"));
   target_creditcard.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                             ASCIIToUTF16("2012"));
-  target_creditcard.SetInfo(AutoFillType(CREDIT_CARD_VERIFICATION_CODE),
-                            ASCIIToUTF16("123"));
   target_creditcard.set_billing_address(ASCIIToUTF16("Overlook Hotel"));
-  target_creditcard.set_shipping_address(string16());
 
   EXPECT_TRUE(db.AddCreditCard(target_creditcard));
   ASSERT_TRUE(db.GetCreditCardForLabel(ASCIIToUTF16("Target"),