Cleanup NativeMetafile (win) interface and EMF class.

chrome/service/service_utility_process_host.cc

 // 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 "chrome/service/service_utility_process_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/utility_messages.h"
 #include "ipc/ipc_switches.h"
 #include "printing/page_range.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "base/scoped_ptr.h"
 #include "base/win/scoped_handle.h"
-#include "printing/native_metafile_factory.h"
-#include "printing/native_metafile.h"
+#include "printing/emf_win.h"
 #endif
 
 ServiceUtilityProcessHost::ServiceUtilityProcessHost(
     Client* client, base::MessageLoopProxy* client_message_loop_proxy)
         : ServiceChildProcessHost(ChildProcessInfo::UTILITY_PROCESS),
           client_(client),
           client_message_loop_proxy_(client_message_loop_proxy),
           waiting_for_reply_(false) {
 }
 
@@ skipping 162 matching lines @@
 
 void ServiceUtilityProcessHost::Client::MetafileAvailable(
     const FilePath& metafile_path,
     int highest_rendered_page_number) {
   // The metafile was created in a temp folder which needs to get deleted after
   // we have processed it.
   ScopedTempDir scratch_metafile_dir;
   if (!scratch_metafile_dir.Set(metafile_path.DirName()))
     LOG(WARNING) << "Unable to set scratch metafile directory";
 #if defined(OS_WIN)
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::Create());
-  if (!metafile->CreateFromFile(metafile_path)) {
+  // It's important that metafile is declared after scratch_metafile_dir so
+  // that the metafile destructor closes the file before the ScopedTempDir
+  // destructor tries to remove the directory.
+  printing::Emf metafile;
+  if (!metafile.InitFromFile(metafile_path)) {
     OnRenderPDFPagesToMetafileFailed();
   } else {
-    OnRenderPDFPagesToMetafileSucceeded(*metafile,
+    OnRenderPDFPagesToMetafileSucceeded(metafile,
                                         highest_rendered_page_number);
-    // Close it so that ScopedTempDir can delete the folder.
-    metafile->CloseEmf();
   }
 #endif  // defined(OS_WIN)
 }