Removed NativeMetafile and PreviewMetafile typedef as it's always PdfMetafileSkia.

chrome/browser/printing/print_view_manager_base.cc

 // Copyright 2013 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/browser/printing/print_view_manager_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "printing/metafile_impl.h"
+#include "printing/pdf_metafile_skia.h"
 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/printing/print_error_dialog.h"
 #endif
 
 #if defined(WIN_PDF_METAFILE_FOR_PRINTING)
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/printing/pdf_to_emf_converter.h"
+#include "printing/emf_win.h"
 #include "printing/pdf_render_settings.h"
 #endif
 
 using base::TimeDelta;
 using content::BrowserThread;
 
 namespace printing {
 
 namespace {
 
@@ skipping 132 matching lines @@
 
   base::SharedMemory shared_buf(params.metafile_data_handle, true);
   if (metafile_must_be_valid) {
     if (!shared_buf.Map(params.data_size)) {
       NOTREACHED() << "couldn't map";
       web_contents()->Stop();
       return;
     }
   }
 
-  scoped_ptr<NativeMetafile> metafile(new NativeMetafile);
+  scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);
   if (metafile_must_be_valid) {
     if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
       NOTREACHED() << "Invalid metafile header";
       web_contents()->Stop();
       return;
     }
   }
 
 #if defined(OS_WIN) && !defined(WIN_PDF_METAFILE_FOR_PRINTING)
   bool big_emf = (params.data_size && params.data_size >= kMetafileMaxSize);
   int raster_size =
       std::min(params.page_size.GetArea(), kMaxRasterSizeInPixels);
   if (big_emf) {
-    scoped_ptr<NativeMetafile> raster_metafile(
+    scoped_ptr<PdfMetafileSkia> raster_metafile(

[Lei Zhang, 2014/08/28 18:11:23]

Shouldn't this be Emf?

[Vitaly Buka (NO REVIEWS), 2014/08/28 18:28:48]

It would go away with WIN_PDF_METAFILE_FOR_PRINTING.
I'll rebase when I submit that patch.

On 2014/08/28 18:11:23, Lei Zhang wrote:

[Vitaly Buka (NO REVIEWS), 2014/08/28 20:18:46]

Done.

         metafile->RasterizeMetafile(raster_size));
     if (raster_metafile.get()) {
       metafile.swap(raster_metafile);
     } else if (big_emf) {
       // Don't fall back to emf here.
       NOTREACHED() << "size:" << params.data_size;
       TerminatePrintJob(true);
       web_contents()->Stop();
       return;
     }
@@ skipping 375 matching lines @@
   scoped_refptr<printing::PrinterQuery> printer_query;
   printer_query = queue_->PopPrinterQuery(cookie);
   if (!printer_query.get())
     return;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrinterQuery::StopWorker, printer_query.get()));
 }
 
 }  // namespace printing