Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: chrome/common/extensions/extension_unpacker_unittest.cc

Issue 8693005: Remove potentially many static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no streq Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/extension_manifests_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_unpacker_unittest.cc
diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc
index e86007b82dd6836bc6bee496756999533d6e6681..c14df0cd5fdf996219cd68161dd027712a1b474f 100644
--- a/chrome/common/extensions/extension_unpacker_unittest.cc
+++ b/chrome/common/extensions/extension_unpacker_unittest.cc
@@ -48,19 +48,22 @@ public:
TEST_F(ExtensionUnpackerTest, EmptyDefaultLocale) {
SetupUnpacker("empty_default_locale.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kInvalidDefaultLocale, unpacker_->error_message());
+ EXPECT_EQ(std::string(errors::kInvalidDefaultLocale),
+ unpacker_->error_message());
}
TEST_F(ExtensionUnpackerTest, HasDefaultLocaleMissingLocalesFolder) {
SetupUnpacker("has_default_missing_locales.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kLocalesTreeMissing, unpacker_->error_message());
+ EXPECT_EQ(std::string(errors::kLocalesTreeMissing),
+ unpacker_->error_message());
}
TEST_F(ExtensionUnpackerTest, InvalidDefaultLocale) {
SetupUnpacker("invalid_default_locale.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kInvalidDefaultLocale, unpacker_->error_message());
+ EXPECT_EQ(std::string(errors::kInvalidDefaultLocale),
+ unpacker_->error_message());
}
TEST_F(ExtensionUnpackerTest, InvalidMessagesFile) {
@@ -74,13 +77,14 @@ TEST_F(ExtensionUnpackerTest, InvalidMessagesFile) {
TEST_F(ExtensionUnpackerTest, MissingDefaultData) {
SetupUnpacker("missing_default_data.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kLocalesNoDefaultMessages, unpacker_->error_message());
+ EXPECT_EQ(std::string(errors::kLocalesNoDefaultMessages),
+ unpacker_->error_message());
}
TEST_F(ExtensionUnpackerTest, MissingDefaultLocaleHasLocalesFolder) {
SetupUnpacker("missing_default_has_locales.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kLocalesNoDefaultLocaleSpecified,
+ EXPECT_EQ(std::string(errors::kLocalesNoDefaultLocaleSpecified),
unpacker_->error_message());
}
@@ -95,7 +99,8 @@ TEST_F(ExtensionUnpackerTest, MissingMessagesFile) {
TEST_F(ExtensionUnpackerTest, NoLocaleData) {
SetupUnpacker("no_locale_data.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_EQ(errors::kLocalesNoDefaultMessages, unpacker_->error_message());
+ EXPECT_EQ(std::string(errors::kLocalesNoDefaultMessages),
+ unpacker_->error_message());
}
TEST_F(ExtensionUnpackerTest, GoodL10n) {
« no previous file with comments | « chrome/common/extensions/extension_manifests_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698