These changes *are* for review :)

chrome/browser/autofill/phone_number_unittest.cc

Index: chrome/browser/autofill/phone_number_unittest.cc
===================================================================
--- chrome/browser/autofill/phone_number_unittest.cc	(revision 84722)
+++ chrome/browser/autofill/phone_number_unittest.cc	(working copy)
@@ -3,126 +3,96 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autofill/home_phone_number.h"
+#include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/phone_number.h"
+#include "chrome/browser/autofill/phone_number_i18n.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// Tests the phone number parser.
-TEST(PhoneNumberTest, Parser) {
-  string16 number;
-  string16 city_code;
-  string16 country_code;
+TEST(PhoneNumberTest, Matcher) {
+  // Set phone number so country_code == 1, city_code = 650, number = 2345678.
+  string16 phone(ASCIIToUTF16("1 [650] 234-5678"));
+  PhoneNumber phone_number(AutofillType::PHONE_HOME);
+  phone_number.set_number(phone);
+  phone_number.set_locale(std::string("US"));
+  phone_number.NormalizePhone();
 
-  // Test for empty string.  Should give back empty strings.
-  string16 phone0;
-  PhoneNumber::ParsePhoneNumber(phone0, &number, &city_code, &country_code);
-  EXPECT_EQ(string16(), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
+  FieldTypeSet matching_types;
+  phone_number.GetMatchingTypes(ASCIIToUTF16(""), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);

[dhollowa, 2011/05/13 18:55:35]

For these tests the constants should use "UL" suffix, and the expected value
should be on the left.  I.e.

EXPECT_EQ(0UL, matching_types.size());

[GeorgeY, 2011/05/18 17:41:45]

Done.

+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("1"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_COUNTRY_CODE) !=
+              matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("16"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  phone_number.GetMatchingTypes(ASCIIToUTF16("165"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  phone_number.GetMatchingTypes(ASCIIToUTF16("1650"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  phone_number.GetMatchingTypes(ASCIIToUTF16("16502"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  phone_number.GetMatchingTypes(ASCIIToUTF16("165023"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  phone_number.GetMatchingTypes(ASCIIToUTF16("1650234"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("16502345678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_WHOLE_NUMBER) !=
+              matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("650"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_CITY_CODE) !=
+              matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("2345678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_NUMBER) != matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("234"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_NUMBER) != matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("5678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_NUMBER) != matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("2345"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 0);
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("6502345678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 2);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_CITY_AND_NUMBER) !=
+              matching_types.end());
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_WHOLE_NUMBER) !=
+              matching_types.end());
+  matching_types.clear();
+  phone_number.GetMatchingTypes(ASCIIToUTF16("(650)2345678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 2);
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_CITY_AND_NUMBER) !=
+              matching_types.end());
+  EXPECT_TRUE(matching_types.find(PHONE_HOME_WHOLE_NUMBER) !=
+              matching_types.end());
 
-  // Test for string with less than 7 digits.  Should give back empty strings.
-  string16 phone1(ASCIIToUTF16("1234"));
-  PhoneNumber::ParsePhoneNumber(phone1, &number, &city_code, &country_code);
-  EXPECT_EQ(string16(), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
+  string16 fax(ASCIIToUTF16("+1(650)650-5678"));
+  PhoneNumber fax_number;
+  fax_number.set_locale(std::string("US"));
+  fax_number.SetInfo(PHONE_FAX_WHOLE_NUMBER, fax);
 
-  // Test for string with exactly 7 digits.  Should give back only phone number.
-  string16 phone2(ASCIIToUTF16("1234567"));
-  PhoneNumber::ParsePhoneNumber(phone2, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("1234567"), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
+  matching_types.clear();
+  fax_number.GetMatchingTypes(ASCIIToUTF16("16506505678"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 1);
+  EXPECT_TRUE(matching_types.find(PHONE_FAX_WHOLE_NUMBER) !=
+              matching_types.end());
 
-  // Test for string with exactly 7 digits and separators.  Should give back
-  // only phone number.
-  string16 phone_separator2(ASCIIToUTF16("123-4567"));
-  PhoneNumber::ParsePhoneNumber(phone_separator2,
-      &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("1234567"), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
-
-  // Test for string with greater than 7 digits but less than 10 digits.
-  // Should give back only phone number.
-  string16 phone3(ASCIIToUTF16("123456789"));
-  PhoneNumber::ParsePhoneNumber(phone3, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("3456789"), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
-
-  // Test for string with greater than 7 digits but less than 10 digits and
-  // separators.
-  // Should give back only phone number.
-  string16 phone_separator3(ASCIIToUTF16("12.345-6789"));
-  PhoneNumber::ParsePhoneNumber(phone3, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("3456789"), number);
-  EXPECT_EQ(string16(), city_code);
-  EXPECT_EQ(string16(), country_code);
-
-  // Test for string with exactly 10 digits.
-  // Should give back phone number and city code.
-  string16 phone4(ASCIIToUTF16("1234567890"));
-  PhoneNumber::ParsePhoneNumber(phone4, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("4567890"), number);
-  EXPECT_EQ(ASCIIToUTF16("123"), city_code);
-  EXPECT_EQ(string16(), country_code);
-
-  // Test for string with exactly 10 digits and separators.
-  // Should give back phone number and city code.
-  string16 phone_separator4(ASCIIToUTF16("(123) 456-7890"));
-  PhoneNumber::ParsePhoneNumber(phone_separator4,
-      &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("4567890"), number);
-  EXPECT_EQ(ASCIIToUTF16("123"), city_code);
-  EXPECT_EQ(string16(), country_code);
-
-  // Test for string with over 10 digits.
-  // Should give back phone number, city code, and country code.
-  string16 phone5(ASCIIToUTF16("011234567890"));
-  PhoneNumber::ParsePhoneNumber(phone5, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("4567890"), number);
-  EXPECT_EQ(ASCIIToUTF16("123"), city_code);
-  EXPECT_EQ(ASCIIToUTF16("01"), country_code);
-
-  // Test for string with over 10 digits with separator characters.
-  // Should give back phone number, city code, and country code.
-  string16 phone6(ASCIIToUTF16("(01) 123-456.7890"));
-  PhoneNumber::ParsePhoneNumber(phone6, &number, &city_code, &country_code);
-  EXPECT_EQ(ASCIIToUTF16("4567890"), number);
-  EXPECT_EQ(ASCIIToUTF16("123"), city_code);
-  EXPECT_EQ(ASCIIToUTF16("01"), country_code);
+  matching_types.clear();
+  fax_number.GetMatchingTypes(ASCIIToUTF16("650"), &matching_types);
+  EXPECT_EQ(matching_types.size(), 2);
+  EXPECT_TRUE(matching_types.find(PHONE_FAX_CITY_CODE) !=
+              matching_types.end());
+  EXPECT_TRUE(matching_types.find(PHONE_FAX_NUMBER) !=
+              matching_types.end());
 }
-
-TEST(PhoneNumberTest, Matcher) {
-  // Set phone number so country_code == 12, city_code = 123, number = 1234567.
-  string16 phone(ASCIIToUTF16("121231234567"));
-  HomePhoneNumber phone_number;
-  phone_number.set_whole_number(phone);
-
-  EXPECT_FALSE(phone_number.IsCountryCode(ASCIIToUTF16("")));
-  EXPECT_FALSE(phone_number.IsCountryCode(ASCIIToUTF16("1")));
-  EXPECT_TRUE(phone_number.IsCountryCode(ASCIIToUTF16("12")));
-  EXPECT_FALSE(phone_number.IsCountryCode(ASCIIToUTF16("123")));
-
-  EXPECT_FALSE(phone_number.IsCityCode(ASCIIToUTF16("")));
-  EXPECT_FALSE(phone_number.IsCityCode(ASCIIToUTF16("1")));
-  EXPECT_FALSE(phone_number.IsCityCode(ASCIIToUTF16("12")));
-  EXPECT_TRUE(phone_number.IsCityCode(ASCIIToUTF16("123")));
-  EXPECT_FALSE(phone_number.IsCityCode(ASCIIToUTF16("1234")));
-
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("1")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("12")));
-  EXPECT_TRUE(phone_number.IsNumber(ASCIIToUTF16("123")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("1234")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("12345")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("123456")));
-  EXPECT_TRUE(phone_number.IsNumber(ASCIIToUTF16("1234567")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("234567")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("34567")));
-  EXPECT_TRUE(phone_number.IsNumber(ASCIIToUTF16("4567")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("567")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("67")));
-  EXPECT_FALSE(phone_number.IsNumber(ASCIIToUTF16("7")));
-}