Autofill refactor form_field.h/cc.
1. Moves FormField methods into proper public/protected/private visibility.
2. Eliminates redundant "Parse" methods.
3. Introduces |MatchType| bit field to simplify variant matching.
4. Consolidates |Match| method.
5. Renames |Add| and |GetFieldInfo| to |AddClassification| and |ClassifyField| respectively.
6. Move ECML logic into separate file.
BUG=none
TEST=Unit tests in autofill/*_field_unittest.cc.
Review URL: http://codereview.chromium.org/7043027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86016 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autofill/credit_card_field_unittest.cc b/chrome/browser/autofill/credit_card_field_unittest.cc
index 7fd248ae..ebfc7e26 100644
--- a/chrome/browser/autofill/credit_card_field_unittest.cc
+++ b/chrome/browser/autofill/credit_card_field_unittest.cc
@@ -5,14 +5,13 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_ecml.h"
#include "chrome/browser/autofill/autofill_field.h"
#include "chrome/browser/autofill/autofill_scanner.h"
#include "chrome/browser/autofill/credit_card_field.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
-namespace {
-
class CreditCardFieldTest : public testing::Test {
public:
CreditCardFieldTest() {}
@@ -104,7 +103,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
@@ -147,7 +146,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
@@ -204,7 +203,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
@@ -270,7 +269,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
@@ -327,7 +326,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("name")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name")]);
@@ -381,7 +380,7 @@
AutofillScanner scanner(list_.get());
field_.reset(CreditCardField::Parse(&scanner, false));
ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("name")) != field_type_map_.end());
EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name")]);
@@ -396,6 +395,3 @@
EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
field_type_map_[ASCIIToUTF16("year")]);
}
-
-} // namespace
-
