GTTF: Use a fresh TestingBrowserProcess for each test, part #4

For a detailed description see part #1, http://codereview.chromium.org/6478005/

BUG=61062
TEST=unit_tests, possibly more

Review URL: http://codereview.chromium.org/7465041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95350 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 64 insertions, 46 deletions

diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc
index 7691ac0..d9d7014 100644
--- a/chrome/browser/autofill/address_unittest.cc
+++ b/chrome/browser/autofill/address_unittest.cc
@@ -8,10 +8,13 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address.h"
 #include "chrome/browser/autofill/autofill_type.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+typedef TestingBrowserProcessTest AddressTest;
+
 // Test that the getters and setters for country code are working.
-TEST(AddressTest, CountryCode) {
+TEST_F(AddressTest, CountryCode) {
   Address address;
   EXPECT_EQ(std::string(), address.country_code());
 
@@ -23,7 +26,7 @@ TEST(AddressTest, CountryCode) {
 }
 
 // Test that country codes are properly decoded as country names.
-TEST(AddressTest, GetCountry) {
+TEST_F(AddressTest, GetCountry) {
   Address address;
   EXPECT_EQ(std::string(), address.country_code());
 
@@ -41,7 +44,7 @@ TEST(AddressTest, GetCountry) {
 }
 
 // Test that we properly detect country codes appropriate for each country.
-TEST(AddressTest, SetCountry) {
+TEST_F(AddressTest, SetCountry) {
   Address address;
   EXPECT_EQ(std::string(), address.country_code());
 
@@ -77,7 +80,7 @@ TEST(AddressTest, SetCountry) {
 }
 
 // Test that we properly match typed values to stored country data.
-TEST(AddressTest, IsCountry) {
+TEST_F(AddressTest, IsCountry) {
   Address address;
   address.set_country_code("US");
 
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
index f98e52a..b6f235c 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/sync/util/data_encryption.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
@@ -107,7 +108,7 @@ void CreateSubkey(RegKey* key, wchar_t const* subkey_name,
 
 }  // namespace
 
-class AutofillIeToolbarImportTest : public testing::Test {
+class AutofillIeToolbarImportTest : public TestingBrowserProcessTest {
  public:
   AutofillIeToolbarImportTest();
 
diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc
index e754a34..9b8071c 100644
--- a/chrome/browser/autofill/autofill_merge_unittest.cc
+++ b/chrome/browser/autofill/autofill_merge_unittest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/autofill/data_driven_test.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
@@ -112,7 +113,8 @@ const std::vector<AutofillProfile*>& PersonalDataManagerMock::web_profiles()
 // corresponding output file is a dump of the saved profiles that result from
 // importing the input profiles. The output file format is identical to the
 // input format.
-class AutofillMergeTest : public testing::Test, public DataDrivenTest {
+class AutofillMergeTest : public TestingBrowserProcessTest,
+                          public DataDrivenTest {
  protected:
   AutofillMergeTest();
   virtual ~AutofillMergeTest();
diff --git a/chrome/browser/autofill/autofill_profile_unittest.cc b/chrome/browser/autofill/autofill_profile_unittest.cc
index a5fa207..df83ae1 100644
--- a/chrome/browser/autofill/autofill_profile_unittest.cc
+++ b/chrome/browser/autofill/autofill_profile_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/common/guid.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -24,9 +25,11 @@ bool UpdateProfileLabel(AutofillProfile *profile) {
 
 }  // namespace
 
+typedef TestingBrowserProcessTest AutofillProfileTest;
+
 // Tests different possibilities for summary string generation.
 // Based on existence of first name, last name, and address line 1.
-TEST(AutofillProfileTest, PreviewSummaryString) {
+TEST_F(AutofillProfileTest, PreviewSummaryString) {
   // Case 0/null: ""
   AutofillProfile profile0;
   // Empty profile - nothing to update.
@@ -128,7 +131,7 @@ TEST(AutofillProfileTest, PreviewSummaryString) {
       "Marion Mitchell Morrison, 123 Zoo St., marion@me.xyz"), summary7a);
 }
 
-TEST(AutofillProfileTest, AdjustInferredLabels) {
+TEST_F(AutofillProfileTest, AdjustInferredLabels) {
   std::vector<AutofillProfile*> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(
@@ -294,7 +297,7 @@ TEST(AutofillProfileTest, AdjustInferredLabels) {
   STLDeleteContainerPointers(profiles.begin(), profiles.end());
 }
 
-TEST(AutofillProfileTest, CreateInferredLabels) {
+TEST_F(AutofillProfileTest, CreateInferredLabels) {
   std::vector<AutofillProfile*> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[0],
@@ -396,7 +399,7 @@ TEST(AutofillProfileTest, CreateInferredLabels) {
 
 // Test that we fall back to using the full name if there are no other
 // distinguishing fields, but only if it makes sense given the suggested fields.
-TEST(AutofillProfileTest, CreateInferredLabelsFallsBackToFullName) {
+TEST_F(AutofillProfileTest, CreateInferredLabelsFallsBackToFullName) {
   ScopedVector<AutofillProfile> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[0],
@@ -430,7 +433,7 @@ TEST(AutofillProfileTest, CreateInferredLabelsFallsBackToFullName) {
 }
 
 // Test that we do not show duplicate fields in the labels.
-TEST(AutofillProfileTest, CreateInferredLabelsNoDuplicatedFields) {
+TEST_F(AutofillProfileTest, CreateInferredLabelsNoDuplicatedFields) {
   ScopedVector<AutofillProfile> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[0],
@@ -456,7 +459,7 @@ TEST(AutofillProfileTest, CreateInferredLabelsNoDuplicatedFields) {
 }
 
 // Make sure that empty fields are not treated as distinguishing fields.
-TEST(AutofillProfileTest, CreateInferredLabelsSkipsEmptyFields) {
+TEST_F(AutofillProfileTest, CreateInferredLabelsSkipsEmptyFields) {
   ScopedVector<AutofillProfile> profiles;
   profiles.push_back(new AutofillProfile);
   autofill_test::SetProfileInfo(profiles[0],
@@ -491,7 +494,7 @@ TEST(AutofillProfileTest, CreateInferredLabelsSkipsEmptyFields) {
   EXPECT_EQ(ASCIIToUTF16("John Doe, john.doe@example.com"), labels[2]);
 }
 
-TEST(AutofillProfileTest, IsSubsetOf) {
+TEST_F(AutofillProfileTest, IsSubsetOf) {
   scoped_ptr<AutofillProfile> a, b;
 
   // |a| is a subset of |b|.
@@ -523,7 +526,7 @@ TEST(AutofillProfileTest, IsSubsetOf) {
   EXPECT_FALSE(a->IsSubsetOf(*b));
 }
 
-TEST(AutofillProfileTest, IntersectionOfTypesHasEqualValues) {
+TEST_F(AutofillProfileTest, IntersectionOfTypesHasEqualValues) {
   scoped_ptr<AutofillProfile> a, b;
 
   // Intersection of types contains the fields NAME_FIRST, NAME_LAST,
@@ -563,7 +566,7 @@ TEST(AutofillProfileTest, IntersectionOfTypesHasEqualValues) {
   EXPECT_FALSE(a->IntersectionOfTypesHasEqualValues(*b));
 }
 
-TEST(AutofillProfileTest, MergeWith) {
+TEST_F(AutofillProfileTest, MergeWith) {
   scoped_ptr<AutofillProfile> a, b;
 
   // Merge |b| into |a|.
@@ -586,7 +589,7 @@ TEST(AutofillProfileTest, MergeWith) {
   EXPECT_EQ(0, expected_b.Compare(*b));
 }
 
-TEST(AutofillProfileTest, AssignmentOperator){
+TEST_F(AutofillProfileTest, AssignmentOperator){
   AutofillProfile a, b;
 
   // Result of assignment should be logically equal to the original profile.
@@ -602,7 +605,7 @@ TEST(AutofillProfileTest, AssignmentOperator){
   EXPECT_TRUE(a == b);
 }
 
-TEST(AutofillProfileTest, Copy) {
+TEST_F(AutofillProfileTest, Copy) {
   AutofillProfile a;
 
   // Clone should be logically equal to the original.
@@ -614,7 +617,7 @@ TEST(AutofillProfileTest, Copy) {
   EXPECT_TRUE(a == b);
 }
 
-TEST(AutofillProfileTest, Compare) {
+TEST_F(AutofillProfileTest, Compare) {
   AutofillProfile a, b;
 
   // Empty profiles are the same.
@@ -634,7 +637,7 @@ TEST(AutofillProfileTest, Compare) {
   EXPECT_LT(0, b.Compare(a));
 }
 
-TEST(AutofillProfileTest, CountryCode) {
+TEST_F(AutofillProfileTest, CountryCode) {
   AutofillProfile profile;
   EXPECT_EQ(std::string(), profile.CountryCode());
 
@@ -642,7 +645,7 @@ TEST(AutofillProfileTest, CountryCode) {
   EXPECT_EQ("US", profile.CountryCode());
 }
 
-TEST(AutofillProfileTest, MultiValueNames) {
+TEST_F(AutofillProfileTest, MultiValueNames) {
   AutofillProfile p;
   const string16 kJohnDoe(ASCIIToUTF16("John Doe"));
   const string16 kJohnPDoe(ASCIIToUTF16("John P. Doe"));
@@ -686,7 +689,7 @@ TEST(AutofillProfileTest, MultiValueNames) {
   EXPECT_EQ(string16(), p.GetInfo(NAME_FULL));
 }
 
-TEST(AutofillProfileTest, MultiValueEmails) {
+TEST_F(AutofillProfileTest, MultiValueEmails) {
   AutofillProfile p;
   const string16 kJohnDoe(ASCIIToUTF16("john@doe.com"));
   const string16 kJohnPDoe(ASCIIToUTF16("john_p@doe.com"));
@@ -730,7 +733,7 @@ TEST(AutofillProfileTest, MultiValueEmails) {
   EXPECT_EQ(string16(), p.GetInfo(EMAIL_ADDRESS));
 }
 
-TEST(AutofillProfileTest, MultiValuePhone) {
+TEST_F(AutofillProfileTest, MultiValuePhone) {
   AutofillProfile p;
   const string16 kJohnDoe(ASCIIToUTF16("4151112222"));
   const string16 kJohnPDoe(ASCIIToUTF16("4151113333"));
@@ -774,7 +777,7 @@ TEST(AutofillProfileTest, MultiValuePhone) {
   EXPECT_EQ(string16(), p.GetInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
-TEST(AutofillProfileTest, MultiValueFax) {
+TEST_F(AutofillProfileTest, MultiValueFax) {
   AutofillProfile p;
   const string16 kJohnDoe(ASCIIToUTF16("4152112222"));
   const string16 kJohnPDoe(ASCIIToUTF16("4153113333"));
diff --git a/chrome/browser/autofill/credit_card_unittest.cc b/chrome/browser/autofill/credit_card_unittest.cc
index 51e551f..3d96f31 100644
--- a/chrome/browser/autofill/credit_card_unittest.cc
+++ b/chrome/browser/autofill/credit_card_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/credit_card.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -39,10 +40,12 @@ const char* const kInvalidNumbers[] = {
 
 }  // namespace
 
+typedef TestingBrowserProcessTest CreditCardTest;
+
 // Tests credit card summary string generation.  This test simulates a variety
 // of different possible summary strings.  Variations occur based on the
 // existence of credit card number, month, and year fields.
-TEST(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
+TEST_F(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
   // Case 0: empty credit card.
   CreditCard credit_card0;
   string16 summary0 = credit_card0.Label();
@@ -96,7 +99,7 @@ TEST(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
   EXPECT_EQ(ASCIIToUTF16("************5100"), obfuscated4);
 }
 
-TEST(CreditCardTest, AssignmentOperator) {
+TEST_F(CreditCardTest, AssignmentOperator) {
   CreditCard a, b;
 
   // Result of assignment should be logically equal to the original profile.
@@ -110,7 +113,7 @@ TEST(CreditCardTest, AssignmentOperator) {
   EXPECT_TRUE(a == b);
 }
 
-TEST(CreditCardTest, IsValidCreditCardNumber) {
+TEST_F(CreditCardTest, IsValidCreditCardNumber) {
   for (size_t i = 0; i < arraysize(kValidNumbers); ++i) {
     SCOPED_TRACE(kValidNumbers[i]);
     EXPECT_TRUE(
@@ -123,7 +126,7 @@ TEST(CreditCardTest, IsValidCreditCardNumber) {
   }
 }
 
-TEST(CreditCardTest, IsComplete) {
+TEST_F(CreditCardTest, IsComplete) {
   CreditCard card;
   EXPECT_FALSE(card.IsComplete());
   card.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Wally T. Walrus"));
@@ -144,7 +147,7 @@ TEST(CreditCardTest, IsComplete) {
   }
 }
 
-TEST(CreditCardTest, InvalidMastercardNumber) {
+TEST_F(CreditCardTest, InvalidMastercardNumber) {
   CreditCard card;
 
   autofill_test::SetCreditCardInfo(&card, "Baby Face Nelson",
@@ -153,7 +156,7 @@ TEST(CreditCardTest, InvalidMastercardNumber) {
 }
 
 // Verify that we preserve exactly what the user typed for credit card numbers.
-TEST(CreditCardTest, SetInfoCreditCardNumber) {
+TEST_F(CreditCardTest, SetInfoCreditCardNumber) {
   CreditCard card;
 
   autofill_test::SetCreditCardInfo(&card, "Bob Dylan",
@@ -163,7 +166,7 @@ TEST(CreditCardTest, SetInfoCreditCardNumber) {
 }
 
 // Verify that we can handle both numeric and named months.
-TEST(CreditCardTest, SetInfoExpirationMonth) {
+TEST_F(CreditCardTest, SetInfoExpirationMonth) {
   CreditCard card;
 
   card.SetInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("05"));
diff --git a/chrome/browser/autofill/phone_number_i18n_unittest.cc b/chrome/browser/autofill/phone_number_i18n_unittest.cc
index 0bc466d..a3dfdad 100644
--- a/chrome/browser/autofill/phone_number_i18n_unittest.cc
+++ b/chrome/browser/autofill/phone_number_i18n_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill_i18n::NormalizePhoneNumber;
@@ -13,7 +14,9 @@ using autofill_i18n::FormatPhone;
 using autofill_i18n::ComparePhones;
 using autofill_i18n::PhoneNumbersMatch;
 
-TEST(PhoneNumberI18NTest, NormalizePhoneNumber) {
+typedef TestingBrowserProcessTest PhoneNumberI18NTest;
+
+TEST_F(PhoneNumberI18NTest, NormalizePhoneNumber) {
   // "Large" digits.
   string16 phone1(UTF8ToUTF16("\xEF\xBC\x91\xEF\xBC\x96\xEF\xBC\x95\xEF\xBC\x90"
                               "\xEF\xBC\x97\xEF\xBC\x94\xEF\xBC\x99\xEF\xBC\x98"
@@ -35,7 +38,7 @@ TEST(PhoneNumberI18NTest, NormalizePhoneNumber) {
   EXPECT_EQ(NormalizePhoneNumber(phone5, "US"), ASCIIToUTF16("6502346789"));
 }
 
-TEST(PhoneNumberI18NTest, ParsePhoneNumber) {
+TEST_F(PhoneNumberI18NTest, ParsePhoneNumber) {
   string16 number;
   string16 city_code;
   string16 country_code;
@@ -243,7 +246,7 @@ TEST(PhoneNumberI18NTest, ParsePhoneNumber) {
   EXPECT_EQ(ASCIIToUTF16("1"), country_code);
 }
 
-TEST(PhoneNumberI18NTest, ConstructPhoneNumber) {
+TEST_F(PhoneNumberI18NTest, ConstructPhoneNumber) {
   string16 number;
   EXPECT_TRUE(ConstructPhoneNumber(ASCIIToUTF16("1"),
                                    ASCIIToUTF16("650"),
@@ -321,7 +324,7 @@ TEST(PhoneNumberI18NTest, ConstructPhoneNumber) {
   EXPECT_EQ(number, ASCIIToUTF16("+49 2423/45678901"));
 }
 
-TEST(PhoneNumberI18NTest, FormatPhone) {
+TEST_F(PhoneNumberI18NTest, FormatPhone) {
   EXPECT_EQ(FormatPhone(ASCIIToUTF16("1[650]234-56-78"), "US",
             autofill_i18n::NATIONAL),
             ASCIIToUTF16("(650) 234-5678"));
@@ -342,7 +345,7 @@ TEST(PhoneNumberI18NTest, FormatPhone) {
             ASCIIToUTF16("+420 16502345678"));
 }
 
-TEST(PhoneNumberI18NTest, ComparePhones) {
+TEST_F(PhoneNumberI18NTest, ComparePhones) {
   EXPECT_EQ(ComparePhones(ASCIIToUTF16("1(650)234-56-78"),
                           ASCIIToUTF16("+16502345678"),
                           "US"),
@@ -369,7 +372,7 @@ TEST(PhoneNumberI18NTest, ComparePhones) {
             autofill_i18n::PHONES_NOT_EQUAL);
 }
 
-TEST(PhoneNumberI18NTest, PhoneNumbersMatch) {
+TEST_F(PhoneNumberI18NTest, PhoneNumbersMatch) {
   // Same numbers, defined country code.
   EXPECT_TRUE(PhoneNumbersMatch(ASCIIToUTF16("4158889999"),
                                 ASCIIToUTF16("4158889999"),
diff --git a/chrome/browser/autofill/select_control_handler_unittest.cc b/chrome/browser/autofill/select_control_handler_unittest.cc
index a19e02a..2be54dc 100644
--- a/chrome/browser/autofill/select_control_handler_unittest.cc
+++ b/chrome/browser/autofill/select_control_handler_unittest.cc
@@ -8,10 +8,13 @@
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/select_control_handler.h"
+#include "chrome/test/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
-TEST(SelectControlHandlerTest, CreditCardMonthExact) {
+typedef TestingBrowserProcessTest SelectControlHandlerTest;
+
+TEST_F(SelectControlHandlerTest, CreditCardMonthExact) {
   const char* const kMonthsNumeric[] = {
     "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12",
   };
@@ -30,7 +33,7 @@ TEST(SelectControlHandlerTest, CreditCardMonthExact) {
   EXPECT_EQ(ASCIIToUTF16("01"), field.value);
 }
 
-TEST(SelectControlHandlerTest, CreditCardMonthAbbreviated) {
+TEST_F(SelectControlHandlerTest, CreditCardMonthAbbreviated) {
   const char* const kMonthsAbbreviated[] = {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
@@ -50,7 +53,7 @@ TEST(SelectControlHandlerTest, CreditCardMonthAbbreviated) {
   EXPECT_EQ(ASCIIToUTF16("Jan"), field.value);
 }
 
-TEST(SelectControlHandlerTest, CreditCardMonthFull) {
+TEST_F(SelectControlHandlerTest, CreditCardMonthFull) {
   const char* const kMonthsFull[] = {
     "January", "February", "March", "April", "May", "June",
     "July", "August", "September", "October", "November", "December",
@@ -70,7 +73,7 @@ TEST(SelectControlHandlerTest, CreditCardMonthFull) {
   EXPECT_EQ(ASCIIToUTF16("January"), field.value);
 }
 
-TEST(SelectControlHandlerTest, CreditCardMonthNumeric) {
+TEST_F(SelectControlHandlerTest, CreditCardMonthNumeric) {
   const char* const kMonthsNumeric[] = {
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
   };
@@ -89,7 +92,7 @@ TEST(SelectControlHandlerTest, CreditCardMonthNumeric) {
   EXPECT_EQ(ASCIIToUTF16("1"), field.value);
 }
 
-TEST(SelectControlHandlerTest, AddressCountryFull) {
+TEST_F(SelectControlHandlerTest, AddressCountryFull) {
   const char* const kCountries[] = {
     "Albania", "Canada"
   };
@@ -108,7 +111,7 @@ TEST(SelectControlHandlerTest, AddressCountryFull) {
   EXPECT_EQ(ASCIIToUTF16("Canada"), field.value);
 }
 
-TEST(SelectControlHandlerTest, AddressCountryAbbrev) {
+TEST_F(SelectControlHandlerTest, AddressCountryAbbrev) {
   const char* const kCountries[] = {
     "AL", "CA"
   };
@@ -127,7 +130,7 @@ TEST(SelectControlHandlerTest, AddressCountryAbbrev) {
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
-TEST(SelectControlHandlerTest, AddressStateFull) {
+TEST_F(SelectControlHandlerTest, AddressStateFull) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
@@ -146,7 +149,7 @@ TEST(SelectControlHandlerTest, AddressStateFull) {
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
-TEST(SelectControlHandlerTest, AddressStateAbbrev) {
+TEST_F(SelectControlHandlerTest, AddressStateAbbrev) {
   const char* const kStates[] = {
     "AL", "CA"
   };
@@ -165,7 +168,7 @@ TEST(SelectControlHandlerTest, AddressStateAbbrev) {
   EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
 }
 
-TEST(SelectControlHandlerTest, FillByValue) {
+TEST_F(SelectControlHandlerTest, FillByValue) {
   const char* const kStates[] = {
     "Alabama", "California"
   };
@@ -187,7 +190,7 @@ TEST(SelectControlHandlerTest, FillByValue) {
   EXPECT_EQ(ASCIIToUTF16("California"), field.value);
 }
 
-TEST(SelectControlHandlerTest, FillByContents) {
+TEST_F(SelectControlHandlerTest, FillByContents) {
   const char* const kStates[] = {
     "Alabama", "California"
   };