| Index: chrome/common/extensions/extension_l10n_util_unittest.cc
|
| diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc
|
| index 8ba14dec7d947acec383203ff49a11402f69dcad..9004b10b46348b360bc00ac819806b521486fa62 100644
|
| --- a/chrome/common/extensions/extension_l10n_util_unittest.cc
|
| +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
|
| @@ -35,7 +35,7 @@ TEST(ExtensionL10nUtil, ValidateLocalesWithBadLocale) {
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| base::FilePath locale = src_path.AppendASCII("ms");
|
| - ASSERT_TRUE(file_util::CreateDirectory(locale));
|
| + ASSERT_TRUE(base::CreateDirectory(locale));
|
|
|
| base::FilePath messages_file = locale.Append(kMessagesFilename);
|
| std::string data = "{ \"name\":";
|
| @@ -56,7 +56,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
|
|
| std::string error;
|
| std::set<std::string> locales;
|
| @@ -72,8 +72,8 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("sr")));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path.AppendASCII("sr")));
|
|
|
| std::string error;
|
| std::set<std::string> locales;
|
| @@ -89,16 +89,16 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
| // Supported locale.
|
| base::FilePath locale_1 = src_path.AppendASCII("sr");
|
| - ASSERT_TRUE(file_util::CreateDirectory(locale_1));
|
| + ASSERT_TRUE(base::CreateDirectory(locale_1));
|
| std::string data("whatever");
|
| ASSERT_TRUE(file_util::WriteFile(
|
| locale_1.Append(kMessagesFilename),
|
| data.c_str(), data.length()));
|
| // Unsupported locale.
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("xxx_yyy")));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path.AppendASCII("xxx_yyy")));
|
|
|
| std::string error;
|
| std::set<std::string> locales;
|
| @@ -161,7 +161,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
|
|
| std::set<std::string> valid_locales;
|
| valid_locales.insert("sr");
|
| @@ -180,10 +180,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
|
|
| base::FilePath locale = src_path.AppendASCII("sr");
|
| - ASSERT_TRUE(file_util::CreateDirectory(locale));
|
| + ASSERT_TRUE(base::CreateDirectory(locale));
|
|
|
| std::string data = "{ \"name\":";
|
| base::FilePath messages_file = locale.Append(kMessagesFilename);
|
| @@ -211,10 +211,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
|
| ASSERT_TRUE(temp.CreateUniqueTempDir());
|
|
|
| base::FilePath src_path = temp.path().Append(kLocaleFolder);
|
| - ASSERT_TRUE(file_util::CreateDirectory(src_path));
|
| + ASSERT_TRUE(base::CreateDirectory(src_path));
|
|
|
| base::FilePath locale_1 = src_path.AppendASCII("en");
|
| - ASSERT_TRUE(file_util::CreateDirectory(locale_1));
|
| + ASSERT_TRUE(base::CreateDirectory(locale_1));
|
|
|
| std::string data =
|
| "{ \"name\": { \"message\": \"something\" }, "
|
| @@ -224,7 +224,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
|
| data.c_str(), data.length()));
|
|
|
| base::FilePath locale_2 = src_path.AppendASCII("sr");
|
| - ASSERT_TRUE(file_util::CreateDirectory(locale_2));
|
| + ASSERT_TRUE(base::CreateDirectory(locale_2));
|
|
|
| ASSERT_TRUE(
|
| file_util::WriteFile(locale_2.Append(kMessagesFilename),
|
|
|