Reset AssertHandler in IPCMessageTest.Metafile.

BUG=55177
TEST=Unit tests

Review URL: http://codereview.chromium.org/4660011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65972 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 21 deletions

diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc
index 48b08f8..6086c12 100644
--- a/chrome/common/common_param_traits_unittest.cc
+++ b/chrome/common/common_param_traits_unittest.cc
@@ -18,15 +18,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#if defined(OS_WIN)
-#ifndef NDEBUG
-namespace {
-void IgnoreAssertHandler(const std::string& str) {
-}
-}  // namespace
-#endif  // NDEBUG
-#endif // defined(OS_WIN)
-
 // Tests that serialize/deserialize correctly understand each other
 TEST(IPCMessageTest, Serialize) {
   const char* serialize_cases[] = {
@@ -234,12 +225,11 @@ TEST(IPCMessageTest, PageRange) {
   EXPECT_TRUE(input == output);
 }
 
-// Enabling this test breaks assert handling for test suite. Bug 55177.
 // Tests printing::NativeMetafile serialization.
-TEST(IPCMessageTest, DISABLED_Metafile) {
-  // TODO(sanjeevr): Make this test meaningful for non-Windows platforms. We
-  // need to initialize the metafile using alternate means on the other OSes.
+// TODO(sanjeevr): Make this test meaningful for non-Windows platforms. We
+// need to initialize the metafile using alternate means on the other OSes.
 #if defined(OS_WIN)
+TEST(IPCMessageTest, Metafile) {
   printing::NativeMetafile metafile;
   RECT test_rect = {0, 0, 100, 100};
   // Create a metsfile using the screen DC as a reference.
@@ -269,14 +259,8 @@ TEST(IPCMessageTest, DISABLED_Metafile) {
   // Make sure we don't read out the metafile!
   printing::NativeMetafile bad_output;
   iter = NULL;
-  // The Emf code on Windows DCHECKs if it cannot create the metafile.
-#ifndef NDEBUG
-  logging::SetLogAssertHandler(IgnoreAssertHandler);
-#endif  // NDEBUG
   EXPECT_FALSE(IPC::ParamTraits<printing::NativeMetafile>::Read(
       &bad_msg, &iter, &bad_output));
-#else  // defined(OS_WIN)
-  NOTIMPLEMENTED();
-#endif  // defined(OS_WIN)
 }
+#endif  // defined(OS_WIN)
 
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 1a7c8dd..9629bb2 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -58,7 +58,6 @@ bool Emf::Init(const void* src_buffer, uint32 src_buffer_size) {
   DCHECK(!emf_ && !hdc_);
   emf_ = SetEnhMetaFileBits(src_buffer_size,
                             reinterpret_cast<const BYTE*>(src_buffer));
-  DCHECK(emf_);
   return emf_ != NULL;
 }