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

printing/image_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/image.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/mac/scoped_cftyperef.h"
+#include "printing/metafile.h"
 #include "printing/pdf_metafile_cg_mac.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace printing {
 
-bool Image::LoadMetafile(const void* metafile_src_buffer,
-                         size_t metafile_src_buffer_size) {
-  PdfMetafileCg metafile;
-  if (!metafile.InitFromData(metafile_src_buffer, metafile_src_buffer_size)) {
-    return false;
-  }
+bool Image::LoadMetafile(const Metafile& metafile) {
   // The printing system uses single-page metafiles (page indexes are 1-based).
   const unsigned int page_number = 1;
   gfx::Rect rect(metafile.GetPageBounds(page_number));
   if (rect.width() < 1 || rect.height() < 1)
     return false;
 
   size_ = rect.size();
   row_length_ = size_.width() * sizeof(uint32_t);
   size_t bytes = row_length_ * size_.height();
   DCHECK(bytes);
 
   data_.resize(bytes);
   base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   base::ScopedCFTypeRef<CGContextRef> bitmap_context(
       CGBitmapContextCreate(&*data_.begin(),
                             size_.width(),
                             size_.height(),
                             8,
                             row_length_,
                             color_space,
                             kCGImageAlphaPremultipliedLast));
   DCHECK(bitmap_context.get());
 
   PdfMetafileCg::RenderPageParams params;
   params.shrink_to_fit = true;
   CGRect cg_rect = CGRectMake(0, 0, size_.width(), size_.height());
-  return metafile.OnRenderPage(page_number, bitmap_context, cg_rect, params);
+  std::vector<char> buffer;
+  return metafile.GetDataAsVector(&buffer) &&
+         PdfMetafileCg::RenderPage(buffer, page_number, bitmap_context, cg_rect,
+                                   params);
 }
 
 }  // namespace printing