Revert of clean up printing::Image and printing::Metafile

printing/pdf_metafile_cg_mac.cc

 // Copyright (c) 2012 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 "printing/pdf_metafile_cg_mac.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 156 matching lines @@
 bool PdfMetafileCg::RenderPage(const std::vector<char>& src_buffer,
                                unsigned int page_number,
                                CGContextRef context,
                                const CGRect rect,
                                const PdfMetafileCg::RenderPageParams& params) {
   PdfMetafileCg metafile;
   if (!metafile.InitFromData(src_buffer.data(), src_buffer.size())) {
     LOG(ERROR) << "Unable to initialize PDF document from data";
     return false;
   }
-  return metafile.OnRenderPage(page_number, context, rect, params);
-}
-
-bool PdfMetafileCg::OnRenderPage(
-    unsigned int page_number,
-    CGContextRef context,
-    const CGRect rect,
-    const PdfMetafileCg::RenderPageParams& params) {
-  CGPDFDocumentRef pdf_doc = GetPDFDocument();
+  CGPDFDocumentRef pdf_doc = metafile.GetPDFDocument();
   if (!pdf_doc) {
     LOG(ERROR) << "Unable to create PDF document from data";
     return false;
   }
   CGPDFPageRef pdf_page = CGPDFDocumentGetPage(pdf_doc, page_number);
   CGRect source_rect = CGPDFPageGetBoxRect(pdf_page, kCGPDFCropBox);
   int pdf_src_rotation = CGPDFPageGetRotationAngle(pdf_page);
   float scaling_factor = 1.0;
   const bool source_is_landscape =
         (source_rect.size.width > source_rect.size.height);
@@ skipping 117 matching lines @@
 
   if (!pdf_doc_.get()) {
     ScopedCFTypeRef<CGDataProviderRef> pdf_data_provider(
         CGDataProviderCreateWithCFData(pdf_data_));
     pdf_doc_.reset(CGPDFDocumentCreateWithProvider(pdf_data_provider));
   }
   return pdf_doc_.get();
 }
 
 }  // namespace printing