Unifying NativeMetafile class interface (as much as possible) for Linux, Mac, Win

chrome/common/common_param_traits_unittest.cc

Index: chrome/common/common_param_traits_unittest.cc
diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc
index 186e68e9503c3833d5c457539f017d1a03631c3d..20387d0a60ef0b2bfd3fd899a428f40d794432b0 100644
--- a/chrome/common/common_param_traits_unittest.cc
+++ b/chrome/common/common_param_traits_unittest.cc
@@ -242,7 +242,7 @@ TEST(IPCMessageTest, Metafile) {
   RECT test_rect = {0, 0, 100, 100};
   // Create a metafile using the screen DC as a reference.
   metafile->CreateDc(NULL, NULL);
-  metafile->CloseDc();
+  metafile->Close();
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<printing::NativeMetafile>::Write(&msg, *metafile);
@@ -254,9 +254,9 @@ TEST(IPCMessageTest, Metafile) {
       &msg, &iter, output.get()));
 
   EXPECT_EQ(metafile->GetDataSize(), output->GetDataSize());
-  EXPECT_EQ(metafile->GetBounds(), output->GetBounds());
-  EXPECT_EQ(::GetDeviceCaps(metafile->hdc(), LOGPIXELSX),
-      ::GetDeviceCaps(output->hdc(), LOGPIXELSX));
+  EXPECT_EQ(metafile->GetPageBounds(1), output->GetPageBounds(1));
+  EXPECT_EQ(::GetDeviceCaps(metafile->context(), LOGPIXELSX),
+      ::GetDeviceCaps(output->context(), LOGPIXELSX));
 
   // Also test the corrupt case.
   IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);