Merge converters

chrome/browser/printing/print_job.cc

Index: chrome/browser/printing/print_job.cc
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
index 836496694d308160e03231a4908fba3c7c5822a6..f0769c9a2d84f48988e198bdc2389845b5aa5f0a 100644
--- a/chrome/browser/printing/print_job.cc
+++ b/chrome/browser/printing/print_job.cc
@@ -224,20 +224,18 @@ PrintedDocument* PrintJob::document() const {
 #if defined(OS_WIN)
 class PrintJob::PdfConversionState {
  public:
-  PdfConversionState(gfx::Size page_size,
-                     gfx::Rect content_area,
-                     std::unique_ptr<PdfConverter> converter)
+  PdfConversionState(gfx::Size page_size, gfx::Rect content_area)
       : page_count_(0),
         current_page_(0),
         pages_in_progress_(0),
         page_size_(page_size),
-        content_area_(content_area),
-        converter_(std::move(converter)) {}
+        content_area_(content_area) {}
 
   void Start(const scoped_refptr<base::RefCountedMemory>& data,
              const PdfRenderSettings& conversion_settings,
              const PdfConverter::StartCallback& start_callback) {
-    converter_->Start(data, conversion_settings, start_callback);
+    converter_ = std::move(PdfConverter::StartPdfToEmfConverter(
+        data, conversion_settings, start_callback));
   }
 
   void GetMorePages(const PdfConverter::GetPageCallback& get_page_callback) {
@@ -281,8 +279,7 @@ void PrintJob::StartPdfToEmfConversion(
     bool print_text_with_gdi) {
   DCHECK(!pdf_conversion_state_);
   pdf_conversion_state_ =
-      base::MakeUnique<PdfConversionState>(page_size, content_area,
-          PdfConverter::CreatePdfToEmfConverter());
+      base::MakeUnique<PdfConversionState>(page_size, content_area);
   const int kPrinterDpi = settings().dpi();
   PdfRenderSettings settings(
       content_area, gfx::Point(0, 0), kPrinterDpi, /*autorotate=*/true,
@@ -329,8 +326,8 @@ void PrintJob::StartPdfToPostScriptConversion(
     const gfx::Point& physical_offsets,
     bool ps_level2) {
   DCHECK(!pdf_conversion_state_);
-  pdf_conversion_state_ = base::MakeUnique<PdfConversionState>(
-      gfx::Size(), gfx::Rect(), PdfConverter::CreatePdfToPostScriptConverter());
+  pdf_conversion_state_ =
+      base::MakeUnique<PdfConversionState>(gfx::Size(), gfx::Rect());
   const int kPrinterDpi = settings().dpi();
   PdfRenderSettings settings(
       content_area, physical_offsets, kPrinterDpi, true /* autorotate? */,