4 files changed, 10 insertions, 13 deletions
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc
index ad99e3a..f0a8bab 100644
--- a/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -284,7 +284,7 @@ void PdfToEmfUtilityProcessHostClient::RunCallbackOnUIThread(
     const std::vector<printing::PageRange>& page_ranges,
     double scale_factor) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ScopedVector<Metafile> pages;
+  ScopedVector<MetafilePlayer> pages;
   std::vector<printing::PageRange>::const_iterator iter;
   for (iter = page_ranges.begin(); iter != page_ranges.end(); ++iter) {
     for (int page_number = iter->from; page_number <= iter->to; ++page_number) {
diff --git a/chrome/browser/printing/pdf_to_emf_converter.h b/chrome/browser/printing/pdf_to_emf_converter.h
index 0ad5a1a..ca7adc4 100644
--- a/chrome/browser/printing/pdf_to_emf_converter.h
+++ b/chrome/browser/printing/pdf_to_emf_converter.h
@@ -14,19 +14,16 @@ class FilePath;
 }
 
 namespace printing {
-class PdfRenderSettings;
-}
 
-namespace printing {
-
-class Metafile;
+class MetafilePlayer;
+class PdfRenderSettings;
 
 class PdfToEmfConverter {
  public:
   // Callback for when the PDF is converted to an EMF.
   // Takes ownership of metafiles.
-  typedef base::Callback<
-      void(double /*scale_factor*/, ScopedVector<Metafile>* /*emf_files*/)>
+  typedef base::Callback<void(double /*scale_factor*/,
+                              ScopedVector<MetafilePlayer>* /*emf_files*/)>
       ResultCallback;
   virtual ~PdfToEmfConverter() {}
 
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index 45f34df..a888fd4 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -130,7 +130,7 @@ void PrintViewManagerBase::OnDidGetDocumentCookie(int cookie) {
 void PrintViewManagerBase::OnPdfToEmfConverted(
     const PrintHostMsg_DidPrintPage_Params& params,
     double scale_factor,
-    ScopedVector<Metafile>* emf_files) {
+    ScopedVector<MetafilePlayer>* emf_files) {
   if (!print_job_.get())
     return;
 
@@ -148,7 +148,7 @@ void PrintViewManagerBase::OnPdfToEmfConverted(
   for (size_t i = 0; i < emf_files->size(); ++i) {
     // Update the rendered document. It will send notifications to the listener.
     document->SetPage(i,
-                      (*emf_files)[i],
+                      make_scoped_ptr((*emf_files)[i]),
                       scale_factor,
                       params.page_size,
                       params.content_area);
@@ -200,7 +200,7 @@ void PrintViewManagerBase::OnDidPrintPage(
 #if !defined(OS_WIN)
   // Update the rendered document. It will send notifications to the listener.
   document->SetPage(params.page_number,
-                    metafile.release(),
+                    metafile.PassAs<MetafilePlayer>(),
                     params.page_size,
                     params.content_area);
 
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index 0a8c5e5..048a4ef 100644
--- a/chrome/browser/printing/print_view_manager_base.h
+++ b/chrome/browser/printing/print_view_manager_base.h
@@ -23,7 +23,7 @@ class RenderViewHost;
 namespace printing {
 
 class JobEventDetails;
-class Metafile;
+class MetafilePlayer;
 class PdfToEmfConverter;
 class PrintJob;
 class PrintJobWorkerOwner;
@@ -138,7 +138,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // Called on completion of converting the pdf to emf.
   void OnPdfToEmfConverted(const PrintHostMsg_DidPrintPage_Params& params,
                            double scale_factor,
-                           ScopedVector<Metafile>* emf_files);
+                           ScopedVector<MetafilePlayer>* emf_files);
 #endif  // OS_WIN
 
   content::NotificationRegistrar registrar_;