Revert 78666 - Cleanup NativeMetafile (win) interface and EMF class.

- Rename CreateDc to Init() and remove unused argument (all non-test calls were CreateDc(NULL, NULL).  [This matches cross platform interface.]
- Remove CreateFileBackedDc from the NativeMetafile interface and make InitToFile() in the EMF class.
- Remove CreateFromFile from the NativeMetafile interface and make it InitFromFile() in the EMF class.
- Move the CloseEmf method into the destructor, making the Emf class a use once class (matches actual use).

BUG=NONE
TEST=NONE

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

TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/6712030

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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h
index ad7eb3e..b770e1a 100644
--- a/chrome/service/service_utility_process_host.h
+++ b/chrome/service/service_utility_process_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -21,6 +21,7 @@
 #include "base/task.h"
 #include "ipc/ipc_channel.h"
 #include "chrome/service/service_child_process_host.h"
+#include "printing/native_metafile.h"
 
 class CommandLine;
 class ScopedTempDir;
@@ -34,7 +35,6 @@ class Rect;
 }  // namespace gfx
 
 namespace printing {
-class Emf;
 struct PageRange;
 struct PrinterCapsAndDefaults;
 }  // namespace printing
@@ -57,7 +57,7 @@ class ServiceUtilityProcessHost : public ServiceChildProcessHost {
     // Called when at least one page in the specified PDF has been rendered
     // successfully into |metafile|.
     virtual void OnRenderPDFPagesToMetafileSucceeded(
-        const printing::Emf& metafile,
+        const printing::NativeMetafile& metafile,
         int highest_rendered_page_number) {}
     // Called when no page in the passed in PDF could be rendered.
     virtual void OnRenderPDFPagesToMetafileFailed() {}