Remove potentially many static initializers.

chrome/common/extensions/extension_unpacker_unittest.cc

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),

[Ryan Sleevi, 2011/11/24 20:13:59]

EXPECT_STREQ 

etc, etc

[Nico, 2011/11/24 20:18:12]

Done.

+            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) {