Revert "Experiment to add bank name in autofill ui."

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

 // Copyright 2013 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 "components/autofill/core/browser/webdata/autofill_table.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 175 matching lines @@
   credit_card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                           s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_NUMBER,
                           UnencryptedCardFromColumn(s, index++, encryptor));
   credit_card->set_use_count(s.ColumnInt64(index++));
   credit_card->set_use_date(base::Time::FromTimeT(s.ColumnInt64(index++)));
   credit_card->set_modification_date(
       base::Time::FromTimeT(s.ColumnInt64(index++)));
   credit_card->set_origin(s.ColumnString(index++));
   credit_card->set_billing_address_id(s.ColumnString(index++));
-  credit_card->set_bank_name(s.ColumnString(index++));
 
   return credit_card;
 }
 
 bool AddAutofillProfileNamesToProfile(sql::Connection* db,
                                       AutofillProfile* profile) {
   // TODO(estade): update schema so that multiple names are not associated per
   // unique profile guid. Please refer https://crbug.com/497934.
   sql::Statement s(db->GetUniqueStatement(
       "SELECT guid, first_name, middle_name, last_name, full_name "
@@ skipping 259 matching lines @@
       return MigrateToVersion67AddMaskedCardBillingAddress();
     case 70:
       *update_compatible_version = false;
       return MigrateToVersion70AddSyncMetadata();
     case 71:
       *update_compatible_version = true;
       return MigrateToVersion71AddHasConvertedAndBillingAddressIdMetadata();
     case 72:
       *update_compatible_version = true;
       return MigrateToVersion72RenameCardTypeToIssuerNetwork();
-    case 73:
-      *update_compatible_version = false;
-      return MigrateToVersion73AddMaskedCardBankName();
   }
   return true;
 }
 
 bool AutofillTable::AddFormFieldValues(
     const std::vector<FormFieldData>& elements,
     std::vector<AutofillChange>* changes) {
   return AddFormFieldValuesTime(elements, changes, AutofillClock::Now());
 }
 
@@ skipping 727 matching lines @@
       "card_number_encrypted, "       // 0
       "last_four,"                    // 1
       "masked.id,"                    // 2
       "metadata.use_count,"           // 3
       "metadata.use_date,"            // 4
       "network,"                      // 5
       "status,"                       // 6
       "name_on_card,"                 // 7
       "exp_month,"                    // 8
       "exp_year,"                     // 9
-      "metadata.billing_address_id,"  // 10
-      "bank_name "                    // 11
+      "metadata.billing_address_id "  // 10
       "FROM masked_credit_cards masked "
       "LEFT OUTER JOIN unmasked_credit_cards USING (id) "
       "LEFT OUTER JOIN server_card_metadata metadata USING (id)"));
   while (s.Step()) {
     int index = 0;
 
     // If the card_number_encrypted field is nonempty, we can assume this card
     // is a full card, otherwise it's masked.
     base::string16 full_card_number =
         UnencryptedCardFromColumn(s, index++, *autofill_table_encryptor_);
@@ skipping 21 matching lines @@
       card->SetNetworkForMaskedCard(card_network.c_str());
     } else {
       DCHECK_EQ(CreditCard::GetCardNetwork(full_card_number), card_network);
     }
 
     card->SetServerStatus(ServerStatusStringToEnum(s.ColumnString(index++)));
     card->SetRawInfo(CREDIT_CARD_NAME_FULL, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, s.ColumnString16(index++));
     card->set_billing_address_id(s.ColumnString(index++));
-    card->set_bank_name(s.ColumnString(index++));
     credit_cards->push_back(std::move(card));
   }
   return s.Succeeded();
 }
 
 void AutofillTable::AddMaskedCreditCards(
     const std::vector<CreditCard>& credit_cards) {
   DCHECK_GT(db_->transaction_nesting(), 0);
   sql::Statement masked_insert(
       db_->GetUniqueStatement("INSERT INTO masked_credit_cards("
                               "id,"            // 0
                               "network,"       // 1
                               "status,"        // 2
                               "name_on_card,"  // 3
                               "last_four,"     // 4
                               "exp_month,"     // 5
-                              "exp_year,"      // 6
-                              "bank_name)"     // 7
-                              "VALUES (?,?,?,?,?,?,?,?)"));
+                              "exp_year)"      // 6
+                              "VALUES (?,?,?,?,?,?,?)"));
   for (const CreditCard& card : credit_cards) {
     DCHECK_EQ(CreditCard::MASKED_SERVER_CARD, card.record_type());
     masked_insert.BindString(0, card.server_id());
     masked_insert.BindString(1, card.network());
     masked_insert.BindString(2,
                              ServerStatusEnumToString(card.GetServerStatus()));
     masked_insert.BindString16(3, card.GetRawInfo(CREDIT_CARD_NAME_FULL));
     masked_insert.BindString16(4, card.LastFourDigits());
     masked_insert.BindString16(5, card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
     masked_insert.BindString16(6,
                                card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
-    masked_insert.BindString(7, card.bank_name());
+
     masked_insert.Run();
     masked_insert.Reset(true);
 
     // Save the use count and use date of the card.
     UpdateServerCardMetadata(card);
   }
 }
 
 void AutofillTable::SetServerCreditCards(
     const std::vector<CreditCard>& credit_cards) {
@@ skipping 645 matching lines @@
 
 bool AutofillTable::InitMaskedCreditCardsTable() {
   if (!db_->DoesTableExist("masked_credit_cards")) {
     if (!db_->Execute("CREATE TABLE masked_credit_cards ("
                       "id VARCHAR,"
                       "status VARCHAR,"
                       "name_on_card VARCHAR,"
                       "network VARCHAR,"
                       "last_four VARCHAR,"
                       "exp_month INTEGER DEFAULT 0,"
-                      "exp_year INTEGER DEFAULT 0, "
-                      "bank_name VARCHAR)")) {
+                      "exp_year INTEGER DEFAULT 0)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::InitUnmaskedCreditCardsTable() {
   if (!db_->DoesTableExist("unmasked_credit_cards")) {
     if (!db_->Execute("CREATE TABLE unmasked_credit_cards ("
@@ skipping 622 matching lines @@
              ") SELECT "
              "id, status, name_on_card, type,    last_four, exp_month, exp_year"
              " FROM masked_credit_cards") &&
          db_->Execute("DROP TABLE masked_credit_cards") &&
          db_->Execute(
              "ALTER TABLE masked_credit_cards_temp "
              "RENAME TO masked_credit_cards") &&
          transaction.Commit();
 }
 
-bool AutofillTable::MigrateToVersion73AddMaskedCardBankName() {
-  sql::Transaction transaction(db_);
-  if (!transaction.Begin())
-    return false;
-
-  // Add the new bank_name column to the masked_credit_cards table.
-  if (!db_->DoesColumnExist("masked_credit_cards", "bank_name") &&
-      !db_->Execute("ALTER TABLE masked_credit_cards ADD COLUMN "
-                    "bank_name VARCHAR")) {
-    return false;
-  }
-
-  return transaction.Commit();
-}
-
 }  // namespace autofill