Cleanup NativeMetafile (win) interface and EMF class.

chrome/common/common_param_traits_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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"
@@ skipping 222 matching lines @@
 
 // Tests printing::Emf serialization.
 // 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) {
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
   RECT test_rect = {0, 0, 100, 100};
   // Create a metafile using the screen DC as a reference.
-  metafile->CreateDc(NULL, NULL);
+  metafile->Init();
   metafile->Close();
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<printing::NativeMetafile>::Write(&msg, *metafile);
 
   scoped_ptr<printing::NativeMetafile> output(
       printing::NativeMetafileFactory::CreateMetafile());
   void* iter = NULL;
   EXPECT_TRUE(IPC::ParamTraits<printing::NativeMetafile>::Read(
       &msg, &iter, output.get()));
@@ skipping 46 matching lines @@
 
   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());
 }