Create a Factory for NativeMetafile.

chrome/common/common_param_traits_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string.h>
 #include <utility>
 
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/geoposition.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/host_port_pair.h"
 #include "printing/backend/print_backend.h"
+#if defined(OS_WIN)

[kmadhusu, 2011/03/01 19:42:38]

Platform-specific headers needs to follow the cross platform headers in a
separate section. 

Eg:
#include "foo/bar/someclass.h"

#include <set>

#include "foo/bar/a.h"
#include "foo/bar/b.h"

#if defined(OS_WIN)
#include "foo/bar/a_win.h"
#include "foo/bar/b_win.h"
#elif defined(OS_POSIX)
#include "foo/bar/a_posix.h"
#endif

[dpapad, 2011/03/01 22:41:24]

Done. I did it also for platform specific includes that already existed.

+#include "printing/emf_win.h"
 #include "printing/native_metafile.h"
+#endif
 #include "printing/page_range.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
 // Tests that serialize/deserialize correctly understand each other
 TEST(IPCMessageTest, Serialize) {
   const char* serialize_cases[] = {
     "http://www.google.com/",
     "http://user:pass@host.com:888/foo;bar?baz#nop",
@@ skipping 177 matching lines @@
   std::string log_message;
   IPC::LogParam(output, &log_message);
   EXPECT_STREQ("<Geoposition>"
                "0.100000 51.300000 13.700000 42.240000 "
                "9.300000 55.000000 120.000000 "
                "1977 unittest error message for geoposition"
                "<Geoposition::ErrorCode>2",
                log_message.c_str());
 }
 
+namespace printing {
+
 // Tests printing::PageRange serialization
 TEST(IPCMessageTest, PageRange) {
   printing::PageRange input;
   input.from = 2;
   input.to = 45;
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<printing::PageRange>::Write(&msg, input);
 
   printing::PageRange output;
   void* iter = NULL;
   EXPECT_TRUE(IPC::ParamTraits<printing::PageRange>::Read(
       &msg, &iter, &output));
   EXPECT_TRUE(input == output);
 }
 
-// Tests printing::NativeMetafile serialization.
+// Tests printing::Emf serialization.

[vandebo (ex-Chrome), 2011/03/01 19:01:01]

This is trying to tests NativeMetafile, not EMF.  It just does a poor job of
testing across platforms.  So it should use NativeMatafile and therefore the
factory.  Don't forget to update the headers.

[dpapad, 2011/03/01 22:41:24]

Done. I also removed this test from the friend list of emf_win.h since it no
longer needs to invoke the constructor.

 // 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;
+  printing::Emf metafile;
   RECT test_rect = {0, 0, 100, 100};
-  // Create a metsfile using the screen DC as a reference.
+  // Create a metafile using the screen DC as a reference.
   metafile.CreateDc(NULL, NULL);
   metafile.CloseDc();
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<printing::NativeMetafile>::Write(&msg, metafile);
 
-  printing::NativeMetafile output;
+  printing::Emf output;
   void* iter = NULL;
   EXPECT_TRUE(IPC::ParamTraits<printing::NativeMetafile>::Read(
       &msg, &iter, &output));
 
   EXPECT_EQ(metafile.GetDataSize(), output.GetDataSize());
   EXPECT_EQ(metafile.GetBounds(), output.GetBounds());
   EXPECT_EQ(::GetDeviceCaps(metafile.hdc(), LOGPIXELSX),
       ::GetDeviceCaps(output.hdc(), LOGPIXELSX));
 
   // Also test the corrupt case.
   IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   // Write some bogus metafile data.
   const size_t bogus_data_size = metafile.GetDataSize() * 2;
   scoped_array<char> bogus_data(new char[bogus_data_size]);
   memset(bogus_data.get(), 'B', bogus_data_size);
   bad_msg.WriteData(bogus_data.get(), bogus_data_size);
   // Make sure we don't read out the metafile!
-  printing::NativeMetafile bad_output;
+  printing::Emf bad_output;
   iter = NULL;
   EXPECT_FALSE(IPC::ParamTraits<printing::NativeMetafile>::Read(
       &bad_msg, &iter, &bad_output));
 }
 #endif  // defined(OS_WIN)
 
 // Tests printing::PrinterCapsAndDefaults serialization
 TEST(IPCMessageTest, PrinterCapsAndDefaults) {
   printing::PrinterCapsAndDefaults input;
   input.printer_capabilities = "Test Capabilities";
   input.caps_mime_type = "text/plain";
   input.printer_defaults = "Test Defaults";
   input.defaults_mime_type = "text/plain";
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<printing::PrinterCapsAndDefaults>::Write(&msg, input);
 
   printing::PrinterCapsAndDefaults output;
   void* iter = NULL;
   EXPECT_TRUE(IPC::ParamTraits<printing::PrinterCapsAndDefaults>::Read(
       &msg, &iter, &output));
   EXPECT_TRUE(input.printer_capabilities == output.printer_capabilities);
   EXPECT_TRUE(input.caps_mime_type == output.caps_mime_type);
   EXPECT_TRUE(input.printer_defaults == output.printer_defaults);
   EXPECT_TRUE(input.defaults_mime_type == output.defaults_mime_type);
 }
 
+}  // namespace printing
+
 // Tests net::HostPortPair serialization
 TEST(IPCMessageTest, HostPortPair) {
   net::HostPortPair input("host.com", 12345);
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<net::HostPortPair>::Write(&msg, input);
 
   net::HostPortPair output;
   void* iter = NULL;
   EXPECT_TRUE(IPC::ParamTraits<net::HostPortPair>::Read(&msg, &iter, &output));
   EXPECT_EQ(input.host(), output.host());
   EXPECT_EQ(input.port(), output.port());
 }