Autofill refactor form_field.h/cc.

chrome/browser/autofill/name_field_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/name_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
-namespace {
-
 class NameFieldTest : public testing::Test {
  public:
   NameFieldTest() {}
 
  protected:
   ScopedVector<AutofillField> list_;
   scoped_ptr<NameField> field_;
   FieldTypeMap field_type_map_;
   std::vector<AutofillField*>::const_iterator iter_;
 
@@ skipping 22 matching lines @@
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
                                                ASCIIToUTF16("Last"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 19 matching lines @@
       new AutofillField(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("lastName"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 11 matching lines @@
       new AutofillField(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("last_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name2")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]);
 }
 
 TEST_F(NameFieldTest, FirstLast2) {
   list_.push_back(
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Name"),
                                                ASCIIToUTF16("first_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name1")));
   list_.push_back(
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Name"),
                                                ASCIIToUTF16("last_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name2")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]);
 }
 
 TEST_F(NameFieldTest, FirstLastMiddleWithSpaces) {
   list_.push_back(
@@ skipping 16 matching lines @@
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Last  Name"),
                                                ASCIIToUTF16("last  name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 11 matching lines @@
       new AutofillField(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("last_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name2")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]);
 }
 
 TEST_F(NameFieldTest, FirstMiddleLastEmpty) {
   list_.push_back(
@@ skipping 16 matching lines @@
       new AutofillField(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("last_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 19 matching lines @@
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
                                                ASCIIToUTF16("last_name"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 43 matching lines @@
       new AutofillField(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("XXXnameXXXlast"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, false));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
@@ skipping 55 matching lines @@
       webkit_glue::FormField(string16(),
                              ASCIIToUTF16("ecom_shipto_postal_name_last"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0,
                              false),
       ASCIIToUTF16("name3")));
   AutofillScanner scanner(list_.get());
   field_.reset(NameField::Parse(&scanner, true));
   ASSERT_NE(static_cast<NameField*>(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(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end());
   EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end());
   EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]);
 }
-
-}  // namespace