Autofill refactor form_field.h/cc.

chrome/browser/autofill/form_field_unittest.cc

Index: chrome/browser/autofill/form_field_unittest.cc
diff --git a/chrome/browser/autofill/form_field_unittest.cc b/chrome/browser/autofill/form_field_unittest.cc
index e9df2deb2b99af7376f32e197b037e5dfdea15a2..1d1aa5020fda4ad6dc492b1e4b350071de13b435 100644
--- a/chrome/browser/autofill/form_field_unittest.cc
+++ b/chrome/browser/autofill/form_field_unittest.cc
@@ -7,78 +7,98 @@
 #include "chrome/browser/autofill/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
 TEST(FormFieldTest, Match) {
   AutofillField field;
 
   // Empty strings match.
-  EXPECT_TRUE(FormField::Match(&field, string16(), true));
+  EXPECT_TRUE(FormField::Match(&field, string16(), FormField::MATCH_LABEL));
 
   // Empty pattern matches non-empty string.
   field.label = ASCIIToUTF16("a");
-  EXPECT_TRUE(FormField::Match(&field, string16(), true));
+  EXPECT_TRUE(FormField::Match(&field, string16(), FormField::MATCH_LABEL));
 
   // Strictly empty pattern matches empty string.
   field.label = ASCIIToUTF16("");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^$"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^$"),
+              FormField::MATCH_LABEL));
 
   // Strictly empty pattern does not match non-empty string.
   field.label = ASCIIToUTF16("a");
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^$"), true));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^$"),
+               FormField::MATCH_LABEL));
 
   // Non-empty pattern doesn't match empty string.
   field.label = string16();
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("a"), true));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("a"),
+               FormField::MATCH_LABEL));
 
   // Beginning of line.
   field.label = ASCIIToUTF16("head_tail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^head"), true));
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^head"),
+              FormField::MATCH_LABEL));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^tail"),
+               FormField::MATCH_LABEL));
 
   // End of line.
   field.label = ASCIIToUTF16("head_tail");
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("head$"), true));
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("tail$"), true));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("head$"),
+               FormField::MATCH_LABEL));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("tail$"),
+              FormField::MATCH_LABEL));
 
   // Exact.
   field.label = ASCIIToUTF16("head_tail");
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^head$"), true));
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^tail$"), true));
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^head_tail$"), true));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^head$"),
+               FormField::MATCH_LABEL));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("^tail$"),
+               FormField::MATCH_LABEL));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("^head_tail$"),
+              FormField::MATCH_LABEL));
 
   // Escaped dots.
   field.label = ASCIIToUTF16("m.i.");
   // Note: This pattern is misleading as the "." characters are wild cards.
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m.i."), true));
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m\\.i\\."), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m.i."),
+              FormField::MATCH_LABEL));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m\\.i\\."),
+              FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("mXiX");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m.i."), true));
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("m\\.i\\."), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("m.i."),
+              FormField::MATCH_LABEL));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("m\\.i\\."),
+               FormField::MATCH_LABEL));
 
   // Repetition.
   field.label = ASCIIToUTF16("headtail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"),
+              FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("headXtail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"),
+              FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("headXXXtail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.*tail"),
+              FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("headtail");
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("head.+tail"), true));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("head.+tail"),
+               FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("headXtail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.+tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.+tail"),
+              FormField::MATCH_LABEL));
   field.label = ASCIIToUTF16("headXXXtail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.+tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head.+tail"),
+              FormField::MATCH_LABEL));
 
   // Alternation.
   field.label = ASCIIToUTF16("head_tail");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head|other"), true));
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("tail|other"), true));
-  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("bad|good"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head|other"),
+              FormField::MATCH_LABEL));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("tail|other"),
+              FormField::MATCH_LABEL));
+  EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("bad|good"),
+               FormField::MATCH_LABEL));
 
   // Case sensitivity.
   field.label = ASCIIToUTF16("xxxHeAd_tAiLxxx");
-  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head_tail"), true));
+  EXPECT_TRUE(FormField::Match(&field, ASCIIToUTF16("head_tail"),
+              FormField::MATCH_LABEL));
 }
-
-}  // namespace