| 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 32120297326dcb4f04dde6b80bf1cb6a7b390674..52c71dee857dff04d18e25195dec9c1e36bf2246 100644
|
| --- a/chrome/common/extensions/extension_l10n_util_unittest.cc
|
| +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
|
| @@ -19,6 +19,7 @@
|
|
|
| using extensions::Extension;
|
| using extensions::ExtensionInfo;
|
| +using extensions::Manifest;
|
| using extensions::MessageBundle;
|
|
|
| namespace errors = extension_manifest_errors;
|
| @@ -560,7 +561,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithNameDescriptionFileHandlerTitle) {
|
|
|
| // Try with NULL manifest.
|
| TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) {
|
| - ExtensionInfo info(NULL, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(NULL, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
| @@ -568,7 +569,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) {
|
| // Try with default and current locales missing.
|
| TEST(ExtensionL10nUtil, ShouldRelocalizeManifestEmptyManifest) {
|
| DictionaryValue manifest;
|
| - ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
| @@ -578,7 +579,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithDefaultLocale) {
|
| DictionaryValue manifest;
|
| manifest.SetString(keys::kDefaultLocale, "en_US");
|
|
|
| - ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
| @@ -589,7 +590,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithCurrentLocale) {
|
| manifest.SetString(keys::kCurrentLocale,
|
| extension_l10n_util::CurrentLocaleOrDefault());
|
|
|
| - ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
| @@ -601,7 +602,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestSameCurrentLocale) {
|
| manifest.SetString(keys::kCurrentLocale,
|
| extension_l10n_util::CurrentLocaleOrDefault());
|
|
|
| - ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
| @@ -612,7 +613,7 @@ TEST(ExtensionL10nUtil, ShouldRelocalizeManifestDifferentCurrentLocale) {
|
| manifest.SetString(keys::kDefaultLocale, "en_US");
|
| manifest.SetString(keys::kCurrentLocale, "sr");
|
|
|
| - ExtensionInfo info(&manifest, "", FilePath(), Extension::LOAD);
|
| + ExtensionInfo info(&manifest, "", FilePath(), Manifest::LOAD);
|
|
|
| EXPECT_TRUE(extension_l10n_util::ShouldRelocalizeManifest(info));
|
| }
|
|
|