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

components/printing/test/mock_printer.cc

Index: components/printing/test/mock_printer.cc
diff --git a/components/printing/test/mock_printer.cc b/components/printing/test/mock_printer.cc
index ede214c946dbd32dfb4f6fae1e73932d322ca862..eb2c9c9ce86bb3f5b9630de958715ecb2b735c2a 100644
--- a/components/printing/test/mock_printer.cc
+++ b/components/printing/test/mock_printer.cc
@@ -51,8 +51,8 @@
 
 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())
@@ -209,9 +209,16 @@
   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