| Index: chrome/browser/autofill/address_unittest.cc
|
| diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc
|
| index 64c7d5fc66500a4e4903fae8105c04e0f04779fa..128fdb7eaf5e01bbdd9a4b037d75172cc951d830 100644
|
| --- a/chrome/browser/autofill/address_unittest.cc
|
| +++ b/chrome/browser/autofill/address_unittest.cc
|
| @@ -14,21 +14,8 @@
|
|
|
| using content::BrowserThread;
|
|
|
| -class AddressTest : public testing::Test {
|
| - public:
|
| - // In order to access the application locale -- which the tested functions do
|
| - // internally -- this test must run on the UI thread.
|
| - AddressTest() : ui_thread_(BrowserThread::UI, &message_loop_) {}
|
| -
|
| - private:
|
| - MessageLoopForUI message_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AddressTest);
|
| -};
|
| -
|
| // Test that the getters and setters for country code are working.
|
| -TEST_F(AddressTest, CountryCode) {
|
| +TEST(AddressTest, CountryCode) {
|
| Address address;
|
| EXPECT_EQ(std::string(), address.country_code());
|
|
|
| @@ -40,7 +27,7 @@ TEST_F(AddressTest, CountryCode) {
|
| }
|
|
|
| // Test that country codes are properly decoded as country names.
|
| -TEST_F(AddressTest, GetCountry) {
|
| +TEST(AddressTest, GetCountry) {
|
| Address address;
|
| EXPECT_EQ(std::string(), address.country_code());
|
|
|
| @@ -58,7 +45,7 @@ TEST_F(AddressTest, GetCountry) {
|
| }
|
|
|
| // Test that we properly detect country codes appropriate for each country.
|
| -TEST_F(AddressTest, SetCountry) {
|
| +TEST(AddressTest, SetCountry) {
|
| Address address;
|
| EXPECT_EQ(std::string(), address.country_code());
|
|
|
| @@ -94,7 +81,7 @@ TEST_F(AddressTest, SetCountry) {
|
| }
|
|
|
| // Test that we properly match typed values to stored country data.
|
| -TEST_F(AddressTest, IsCountry) {
|
| +TEST(AddressTest, IsCountry) {
|
| Address address;
|
| address.set_country_code("US");
|
|
|
|
|