Remove "theme" in extension/app unpacker error messages, make those messages localizable, and add u…

chrome/common/extensions/unpacker_unittest.cc

Index: chrome/common/extensions/unpacker_unittest.cc
diff --git a/chrome/common/extensions/unpacker_unittest.cc b/chrome/common/extensions/unpacker_unittest.cc
index 2a052e998838783208599d758677feed078e32b1..5f69ebbde2f2b65fc63574decd1fe1083def3ace 100644
--- a/chrome/common/extensions/unpacker_unittest.cc
+++ b/chrome/common/extensions/unpacker_unittest.cc
@@ -9,12 +9,14 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace errors = extension_manifest_errors;
+namespace filenames = extension_filenames;
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
@@ -191,4 +193,79 @@ TEST_F(UnpackerTest, MAYBE_NoL10n) {
   EXPECT_EQ(0U, unpacker_->parsed_catalogs()->size());
 }
 
+// Disabled on Windows because it probably crashes intermittently as described
+// in <http://crbug.com/109238>. However, because the logic being testing here
+// is platform-independant, this test should still provide good coverage.
+#if defined(OS_WIN)
+#define MAYBE_UnzipDirectoryError DISABLED_UnzipDirectoryError
+#else
+#define MAYBE_UnzipDirectoryError UnzipDirectoryError
+#endif
+TEST_F(UnpackerTest, MAYBE_UnzipDirectoryError) {
+  const char* kExpected = "Could not create directory for unzipping: ";
+  SetupUnpacker("good_package.crx");
+  FilePath path = temp_dir_.path().AppendASCII(filenames::kTempExtensionName);
+  ASSERT_TRUE(file_util::WriteFile(path, "foo", 3));
+  EXPECT_FALSE(unpacker_->Run());
+  EXPECT_TRUE(StartsWith(unpacker_->error_message(),
+              ASCIIToUTF16(kExpected),
+              false)) << "Expected prefix: \"" << kExpected
+                      << "\", actual error: \"" << unpacker_->error_message()
+                      << "\"";

[dharcourt, 2012/08/27 17:55:55]

Corrected formatting (<< at the beginning of lines instead of end).

+}
+
+// Disabled on Windows because it probably crashes intermittently as described
+// in <http://crbug.com/109238>. However, because the logic being testing here
+// is platform-independant, this test should still provide good coverage.
+#if defined(OS_WIN)
+#define MAYBE_UnzipError DISABLED_UnzipError
+#else
+#define MAYBE_UnzipError UnzipError
+#endif
+TEST_F(UnpackerTest, MAYBE_UnzipError) {
+  const char* kExpected = "Could not unzip extension";
+  SetupUnpacker("bad_zip.crx");
+  EXPECT_FALSE(unpacker_->Run());
+  EXPECT_EQ(ASCIIToUTF16(kExpected), unpacker_->error_message());
+}
+
+// Disabled on Windows because it probably crashes intermittently as described
+// in <http://crbug.com/109238>. However, because the logic being testing here
+// is platform-independant, this test should still provide good coverage.
+#if defined(OS_WIN)
+#define MAYBE_BadPathError DISABLED_BadPathError
+#else
+#define MAYBE_BadPathError BadPathError
+#endif
+TEST_F(UnpackerTest, MAYBE_BadPathError) {
+  const char* kExpected = "Illegal path (absolute or relative with '..'): ";

[dharcourt, 2012/08/27 17:55:55]

Tweaked the message to make it more compatible with including the path name.

+  SetupUnpacker("bad_path.crx");
+  EXPECT_FALSE(unpacker_->Run());
+  EXPECT_TRUE(StartsWith(unpacker_->error_message(),
+              ASCIIToUTF16(kExpected),
+              false)) << "Expected prefix: \"" << kExpected
+                      << "\", actual error: \"" << unpacker_->error_message()
+                      << "\"";
+}
+
+
+// Disabled on Windows because it probably crashes intermittently as described
+// in <http://crbug.com/109238>. However, because the logic being testing here
+// is platform-independant, this test should still provide good coverage.
+#if defined(OS_WIN)
+#define MAYBE_ImageDecodingError DISABLED_ImageDecodingError
+#else
+#define MAYBE_ImageDecodingError ImageDecodingError
+#endif
+TEST_F(UnpackerTest, MAYBE_ImageDecodingError) {
+  const char* kExpected = "Could not decode image: ";
+  SetupUnpacker("bad_image.crx");
+  EXPECT_FALSE(unpacker_->Run());
+  EXPECT_TRUE(StartsWith(unpacker_->error_message(),
+              ASCIIToUTF16(kExpected),
+              false)) << "Expected prefix: \"" << kExpected
+                      << "\", actual error: \"" << unpacker_->error_message()
+                      << "\"";

[dharcourt, 2012/08/27 17:55:55]

Moved the ImageDecodingError test in this patch to match the order of the tests
match the order of the corresponding code.

+}
+
 }  // namespace extensions