AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/webdata/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 1549 matching lines @@
   s->BindString16(3, text);
   text.clear();  // No unencrypted cc info.
   s->BindString16(4, text);
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_MONTH));
   s->BindString16(5, text);
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR));
   s->BindString16(6, text);
   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) {
   sql::Statement s(db_.GetUniqueStatement(
       "INSERT INTO credit_cards"
       "(label, unique_id, name_on_card, type, card_number,"
       " expiration_month, expiration_year, verification_code, billing_address,"
       " shipping_address, card_number_encrypted, verification_code_encrypted)"
       "VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"));
   if (!s) {
@@ skipping 31 matching lines @@
       Encryptor::DecryptString16(encrypted_cc, &credit_card_number);
     }
   }
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_NUMBER), credit_card_number);
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH),
                        s.ColumnString16(5));
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                        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.
 
   return credit_card;
 }
 
 bool WebDatabase::GetCreditCardForLabel(const string16& label,
                                         CreditCard** credit_card) {
   DCHECK(credit_card);
   sql::Statement s(db_.GetUniqueStatement(
@@ skipping 233 matching lines @@
 
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return;
   }
 }