Cleanup NativeMetafile (win) interface and EMF class.

chrome/service/cloud_print/print_system_win.cc

-// Copyright (c) 2010 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 "chrome/service/cloud_print/print_system.h"
 
 #include <objidl.h>
 #include <winspool.h>
 #if defined(_WIN32_WINNT)
 #undef _WIN32_WINNT
 #endif  // defined(_WIN32_WINNT)
 #define _WIN32_WINNT _WIN32_WINNT_WIN7
 #include <xpsprint.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_hdc.h"
 #include "chrome/service/service_process.h"
 #include "chrome/service/service_utility_process_host.h"
 #include "grit/generated_resources.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/print_backend_consts.h"
 #include "printing/backend/win_helper.h"
-#include "printing/native_metafile.h"
+#include "printing/emf_win.h"
 #include "printing/page_range.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 
 using base::win::ScopedBstr;
 using base::win::ScopedComPtr;
 
 namespace {
 
 class DevMode {
@@ skipping 401 matching lines @@
           return ret;
         } else {
           NOTREACHED();
           return false;
         }
         return true;
       }
 
       // ServiceUtilityProcessHost::Client implementation.
       virtual void OnRenderPDFPagesToMetafileSucceeded(
-          const printing::NativeMetafile& metafile,
+          const printing::Emf& metafile,
           int highest_rendered_page_number) {
         metafile.SafePlayback(printer_dc_.Get());
         bool done_printing = (highest_rendered_page_number !=
             last_page_printed_ + kPageCountPerBatch);
         last_page_printed_ = highest_rendered_page_number;
         if (done_printing)
           PrintJobDone();
         else
           RenderNextPDFPages();
       }
@@ skipping 401 matching lines @@
   RpcStringFree(reinterpret_cast<RPC_WSTR *>(&proxy_id_as_string));
   return ret;
 }
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
     const DictionaryValue* print_system_settings) {
   return new PrintSystemWin;
 }
 
 }  // namespace cloud_print