Reduce boxing and unboxing of AutofillFieldType

chrome/browser/autofill/credit_card.cc

 // Copyright (c) 2011 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.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 167 matching lines @@
   if (!Expiration2DigitYearAsString().empty())
     available_types->insert(CREDIT_CARD_EXP_2_DIGIT_YEAR);
 
   if (!Expiration4DigitYearAsString().empty())
     available_types->insert(CREDIT_CARD_EXP_4_DIGIT_YEAR);
 
   if (!number().empty())
     available_types->insert(CREDIT_CARD_NUMBER);
 }
 
-void CreditCard::FindInfoMatches(const AutofillType& type,
+void CreditCard::FindInfoMatches(AutofillFieldType type,
                                  const string16& info,
                                  std::vector<string16>* matched_text) const {
   DCHECK(matched_text);
 
   string16 match;
-  switch (type.field_type()) {
+  switch (type) {
     case CREDIT_CARD_NUMBER: {
       // Because the credit card number is encrypted and we are not able to do
       // comparisons with it we will say that any field that is known to be a
       // credit card number field will match all credit card numbers.
-      string16 text = GetPreviewText(AutofillType(CREDIT_CARD_NUMBER));
+      string16 text = GetPreviewText(CREDIT_CARD_NUMBER);
       if (!text.empty())
         matched_text->push_back(text);
       break;
     }
 
     case CREDIT_CARD_VERIFICATION_CODE:
       NOTREACHED();
       break;
 
     case UNKNOWN_TYPE:
       for (int i = 0; i < kAutoFillCreditCardLength; ++i) {
         if (FindInfoMatchesHelper(kAutoFillCreditCardTypes[i], info, &match))
           matched_text->push_back(match);
       }
       break;
 
     default:
-      if (FindInfoMatchesHelper(type.field_type(), info, &match))
+      if (FindInfoMatchesHelper(type, info, &match))
         matched_text->push_back(match);
       break;
   }
 }
 
-string16 CreditCard::GetFieldText(const AutofillType& type) const {
-  switch (type.field_type()) {
+string16 CreditCard::GetFieldText(AutofillFieldType type) const {
+  switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card();
 
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       return Expiration2DigitYearAsString();
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
@@ skipping 25 matching lines @@
     case CREDIT_CARD_VERIFICATION_CODE:
       NOTREACHED();
       return string16();
 
     default:
       // ComputeDataPresentForArray will hit this repeatedly.
       return string16();
   }
 }
 
-string16 CreditCard::GetPreviewText(const AutofillType& type) const {
-  switch (type.field_type()) {
+string16 CreditCard::GetPreviewText(AutofillFieldType type) const {
+  switch (type) {
     case CREDIT_CARD_NUMBER:
       return last_four_digits();
 
     case CREDIT_CARD_VERIFICATION_CODE:
       NOTREACHED();
       return string16();
 
     default:
       return GetFieldText(type);
   }
 }
 
-void CreditCard::SetInfo(const AutofillType& type, const string16& value) {
-  switch (type.field_type()) {
+void CreditCard::SetInfo(AutofillFieldType type, const string16& value) {
+  switch (type) {
     case CREDIT_CARD_NAME:
       set_name_on_card(value);
       break;
 
     case CREDIT_CARD_EXP_MONTH:
       SetExpirationMonthFromString(value);
       break;
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       // This is a read-only attribute.
@@ skipping 19 matching lines @@
         set_last_four_digits(value.substr(value.length() - 4));
       else
         set_last_four_digits(string16());
     }  break;
 
     case CREDIT_CARD_VERIFICATION_CODE:
       NOTREACHED();
       break;
 
     default:
-      DLOG(ERROR) << "Attempting to set unknown info-type "
-                  << type.field_type();
+      DLOG(ERROR) << "Attempting to set unknown info-type " << type;
       break;
   }
 }
 
 const string16 CreditCard::Label() const {
   return label_;
 }
 
 void CreditCard::SetInfoForMonthInputType(const string16& value) {
   // Check if |text| is "yyyy-mm" format first, and check normal month format.
@@ skipping 68 matching lines @@
 
 int CreditCard::Compare(const CreditCard& credit_card) const {
   // The following CreditCard field types are the only types we store in the
   // WebDB so far, so we're only concerned with matching these types in the
   // credit card.
   const AutofillFieldType types[] = { CREDIT_CARD_NAME,
                                       CREDIT_CARD_NUMBER,
                                       CREDIT_CARD_EXP_MONTH,
                                       CREDIT_CARD_EXP_4_DIGIT_YEAR };
   for (size_t index = 0; index < arraysize(types); ++index) {
-    int comparison = GetFieldText(AutofillType(types[index])).compare(
-        credit_card.GetFieldText(AutofillType(types[index])));
+    int comparison = GetFieldText(types[index]).compare(
+        credit_card.GetFieldText(types[index]));
     if (comparison != 0)
       return comparison;
   }
 
   return 0;
 }
 
 bool CreditCard::operator==(const CreditCard& credit_card) const {
   if (label_ != credit_card.label_ || guid_ != credit_card.guid_)
     return false;
@@ skipping 95 matching lines @@
 
 void CreditCard::set_expiration_year(int expiration_year) {
   if (expiration_year != 0 &&
       (expiration_year < 2006 || expiration_year > 10000)) {
     return;
   }
 
   expiration_year_ = expiration_year;
 }
 
-bool CreditCard::FindInfoMatchesHelper(const AutofillFieldType& field_type,
+bool CreditCard::FindInfoMatchesHelper(AutofillFieldType field_type,
                                        const string16& info,
                                        string16* match) const {
   DCHECK(match);
 
   match->clear();
   switch (field_type) {
     case CREDIT_CARD_NAME: {
       if (StartsWith(name_on_card(), info, false))
         *match = name_on_card();
       break;
@@ skipping 92 matching lines @@
   return true;
 }
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) {
   return os
       << UTF16ToUTF8(credit_card.Label())
       << " "
       << credit_card.guid()
       << " "
-      << UTF16ToUTF8(credit_card.GetFieldText(AutofillType(CREDIT_CARD_NAME)))
+      << UTF16ToUTF8(credit_card.GetFieldText(CREDIT_CARD_NAME))
       << " "
-      << UTF16ToUTF8(credit_card.GetFieldText(AutofillType(CREDIT_CARD_TYPE)))
+      << UTF16ToUTF8(credit_card.GetFieldText(CREDIT_CARD_TYPE))
       << " "
-      << UTF16ToUTF8(credit_card.GetFieldText(AutofillType(CREDIT_CARD_NUMBER)))
+      << UTF16ToUTF8(credit_card.GetFieldText(CREDIT_CARD_NUMBER))
       << " "
-      << UTF16ToUTF8(credit_card.GetFieldText(
-             AutofillType(CREDIT_CARD_EXP_MONTH)))
+      << UTF16ToUTF8(credit_card.GetFieldText(CREDIT_CARD_EXP_MONTH))
       << " "
-      << UTF16ToUTF8(credit_card.GetFieldText(
-             AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
+      << UTF16ToUTF8(credit_card.GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 // These values must match the values in WebKitClientImpl in webkit/glue. We
 // send these strings to WK, which then asks WebKitClientImpl to load the image
 // data.
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";