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

components/printing/test/mock_printer.cc

 // Copyright 2014 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 "components/printing/test/mock_printer.h"
 
 #include "base/files/file_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 33 matching lines @@
                               int scale_factor,
                               PrintMsg_Print_Params* params) {
   params->page_size = page_size;
   params->scale_factor = static_cast<double>(scale_factor) / 100.0;
 }
 
 }  // namespace
 
 MockPrinterPage::MockPrinterPage(const void* source_data,
                                  uint32_t source_size,
-                                 printing::Image image)
-    : source_size_(source_size), image_(std::move(image)) {
+                                 const printing::Image& image)
+    : source_size_(source_size), image_(image) {
   // Create copies of the source data
   source_data_.reset(new uint8_t[source_size]);
   if (source_data_.get())
     memcpy(source_data_.get(), source_data, source_size);
 }
 
 MockPrinterPage::~MockPrinterPage() {
 }
 
 MockPrinter::MockPrinter()
@@ skipping 136 matching lines @@
   EXPECT_EQ(page_number_, params.page_number);
   EXPECT_LE(params.page_number, number_pages_);
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // Load the data sent from a RenderView object and create a PageData object.
   // We duplicate the given file handle when creating a base::SharedMemory
   // instance so that its destructor closes the copy.
   EXPECT_GT(params.data_size, 0U);
   base::SharedMemory metafile_data(params.metafile_data_handle, true);
   metafile_data.Map(params.data_size);
-  printing::Image image(metafile_data.memory(), params.data_size);
-  scoped_refptr<MockPrinterPage> page(new MockPrinterPage(
-      metafile_data.memory(), params.data_size, std::move(image)));
+#if defined(OS_MACOSX)
+  printing::PdfMetafileCg metafile;
+#else
+  printing::PdfMetafileSkia metafile(printing::PDF_SKIA_DOCUMENT_TYPE);
+#endif
+  metafile.InitFromData(metafile_data.memory(), params.data_size);
+  printing::Image image(metafile);
+  MockPrinterPage* page_data =
+      new MockPrinterPage(metafile_data.memory(), params.data_size, image);
+  scoped_refptr<MockPrinterPage> page(page_data);
   pages_.push_back(page);
 #endif
 
   // We finish printing a printing job.
   // Reset the job status and the printer status.
   ++page_number_;
   if (number_pages_ == page_number_)
     ResetPrinter();
 }
 
@@ skipping 64 matching lines @@
   params->margin_left = margin_left_;
   params->margin_top = margin_top_;
   params->is_first_request = is_first_request_;
   params->print_scaling_option = print_scaling_option_;
   params->print_to_pdf = print_to_pdf_;
   params->preview_request_id = preview_request_id_;
   params->display_header_footer = display_header_footer_;
   params->title = title_;
   params->url = url_;
 }