| Index: chrome/browser/sync/util/user_settings_unittest.cc
|
| diff --git a/chrome/browser/sync/util/user_settings_unittest.cc b/chrome/browser/sync/util/user_settings_unittest.cc
|
| index 036dcd305db396689b847edb63d4a7a147a7e3ad..0545b946a4867961d1e0110d9bad1230659f9ebb 100644
|
| --- a/chrome/browser/sync/util/user_settings_unittest.cc
|
| +++ b/chrome/browser/sync/util/user_settings_unittest.cc
|
| @@ -225,13 +225,13 @@ TEST_F(UserSettingsTest, MigrateFromV11ToV12) {
|
| }
|
|
|
| TEST_F(UserSettingsTest, APEncode) {
|
| - string test;
|
| + std::string test;
|
| char i;
|
| for (i = numeric_limits<char>::min(); i < numeric_limits<char>::max(); ++i)
|
| test.push_back(i);
|
| test.push_back(i);
|
| - const string encoded = APEncode(test);
|
| - const string decoded = APDecode(encoded);
|
| + const std::string encoded = APEncode(test);
|
| + const std::string decoded = APDecode(encoded);
|
| ASSERT_EQ(test, decoded);
|
| }
|
|
|
|
|