AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/credit_card_field.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/autofill/credit_card_field.h"
 
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_field.h"
 
@@ skipping 12 matching lines @@
 
   Add(field_type_map, type_, AutoFillType(CREDIT_CARD_TYPE));
 
   ok = ok && Add(field_type_map, expiration_month_,
       AutoFillType(CREDIT_CARD_EXP_MONTH));
   DCHECK(ok);
   ok = ok && Add(field_type_map, expiration_year_,
       AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR));
   DCHECK(ok);
 
-  Add(field_type_map, verification_,
-      AutoFillType(CREDIT_CARD_VERIFICATION_CODE));
-
   return ok;
 }
 
 // static
 CreditCardField* CreditCardField::Parse(
     std::vector<AutoFillField*>::const_iterator* iter,
     bool is_ecml) {
   scoped_ptr<CreditCardField> credit_card_field(new CreditCardField);
   std::vector<AutoFillField*>::const_iterator q = *iter;
   string16 pattern;
@@ skipping 35 matching lines @@
           ParseText(&p, ASCIIToUTF16("^clnm"),
                     &credit_card_field->cardholder_last_)) {
         credit_card_field->cardholder_ = first;
         q = p;
         continue;
       }
     }
 
     // TODO(jhawkins): Parse the type select control.
 
-    // We look for a card security code before we look for a credit card number
-    // and match the general term "number".  The security code has a plethora of
-    // names; we've seen "verification #", "verification number",
-    // "card identification number" and others listed in the ParseText() call
-    // below.
-    if (is_ecml) {
-      pattern = GetEcmlPattern(kEcmlCardVerification);
-    } else {
-      pattern = ASCIIToUTF16(
-          "verification|card identification|cvn|security code|cvv code|cvc");
-    }
-
-    if (credit_card_field->verification_ == NULL &&
-        ParseText(&q, pattern, &credit_card_field->verification_)) {
-      continue;
-    }
-
     if (is_ecml)
       pattern = GetEcmlPattern(kEcmlCardNumber);
     else
       pattern = ASCIIToUTF16("number|card #|card no.|card_number|card number");
 
     if (credit_card_field->number_ == NULL && ParseText(&q, pattern,
         &credit_card_field->number_))
       continue;
 
     // "Expiration date" is the most common label here, but some pages have
@@ skipping 52 matching lines @@
   }
 
   return NULL;
 }
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
       type_(NULL),
       number_(NULL),
-      verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL) {
 }