diff options
Diffstat (limited to 'chrome/common/extensions/extension_l10n_util_unittest.cc')
-rw-r--r-- | chrome/common/extensions/extension_l10n_util_unittest.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 52c71de..3e00552 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc @@ -74,7 +74,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); std::string error; @@ -90,7 +90,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("sr"))); @@ -107,10 +107,10 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); // Supported locale. - FilePath locale_1 = src_path.AppendASCII("sr"); + base::FilePath locale_1 = src_path.AppendASCII("sr"); ASSERT_TRUE(file_util::CreateDirectory(locale_1)); std::string data("whatever"); ASSERT_TRUE(file_util::WriteFile( @@ -131,7 +131,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) { } TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocalesAndMessagesFile) { - FilePath install_dir; + base::FilePath install_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir)); install_dir = install_dir.AppendASCII("extensions") .AppendASCII("good") @@ -152,7 +152,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocalesAndMessagesFile) { } TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) { - FilePath install_dir; + base::FilePath install_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir)); install_dir = install_dir.AppendASCII("extensions") .AppendASCII("good") @@ -179,7 +179,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); std::set<std::string> valid_locales; @@ -198,10 +198,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); - FilePath locale = src_path.AppendASCII("sr"); + base::FilePath locale = src_path.AppendASCII("sr"); ASSERT_TRUE(file_util::CreateDirectory(locale)); std::string data = "{ \"name\":"; @@ -225,10 +225,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) { base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); - FilePath src_path = temp.path().Append(Extension::kLocaleFolder); + base::FilePath src_path = temp.path().Append(Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(src_path)); - FilePath locale_1 = src_path.AppendASCII("en"); + base::FilePath locale_1 = src_path.AppendASCII("en"); ASSERT_TRUE(file_util::CreateDirectory(locale_1)); std::string data = @@ -238,7 +238,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) { file_util::WriteFile(locale_1.Append(Extension::kMessagesFilename), data.c_str(), data.length())); - FilePath locale_2 = src_path.AppendASCII("sr"); + base::FilePath locale_2 = src_path.AppendASCII("sr"); ASSERT_TRUE(file_util::CreateDirectory(locale_2)); ASSERT_TRUE( @@ -561,7 +561,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionFileHandlerTitle) { // Try with NULL manifest. TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) { - ExtensionInfo info(NULL, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(NULL, "", base::FilePath(), Manifest::LOAD); EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info)); } @@ -569,7 +569,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) { // Try with default and current locales missing. TEST(ExtensionL10nUtil, ShouldRelocalizeManifestEmptyManifest) { DictionaryValue manifest; - ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::LOAD); EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info)); } @@ -579,7 +579,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithDefaultLocale) { DictionaryValue manifest; manifest.SetString(keys::kDefaultLocale, "en_US"); - ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::LOAD); EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info)); } @@ -590,7 +590,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithCurrentLocale) { manifest.SetString(keys::kCurrentLocale, extension_l10n_util::CurrentLocaleOrDefault()); - ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::LOAD); EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info)); } @@ -602,7 +602,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestSameCurrentLocale) { manifest.SetString(keys::kCurrentLocale, extension_l10n_util::CurrentLocaleOrDefault()); - ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::LOAD); EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info)); } @@ -613,7 +613,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestDifferentCurrentLocale) { manifest.SetString(keys::kDefaultLocale, "en_US"); manifest.SetString(keys::kCurrentLocale, "sr"); - ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD); + ExtensionInfo info(&manifest, "", base::FilePath(), Manifest::LOAD); EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info)); } |