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

chrome/service/service_utility_process_host.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 "chrome/service/service_utility_process_host.h"
 
 #include <stdint.h>
 
 #include <queue>
 #include <utility>
@@ skipping 19 matching lines @@
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_channel_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/named_platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "printing/emf_win.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace {
 
 using content::ChildProcessHost;
 
 enum ServiceUtilityProcessHostEvent {
   SERVICE_UTILITY_STARTED,
@@ skipping 371 matching lines @@
     const std::string& printer_name) {
   DCHECK(waiting_for_reply_);
   ReportUmaEvent(SERVICE_UTILITY_SEMANTIC_CAPS_FAILED);
   waiting_for_reply_ = false;
   client_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Client::OnGetPrinterSemanticCapsAndDefaults,
                             client_.get(), false, printer_name,
                             printing::PrinterSemanticCapsAndDefaults()));
 }
 
-bool ServiceUtilityProcessHost::Client::OnRenderPDFPagesToMetafilePageDone(
-    const std::vector<char>&,
-    float) {
-  return false;
-}
-
 bool ServiceUtilityProcessHost::Client::MetafileAvailable(float scale_factor,
                                                           base::File file) {
   file.Seek(base::File::FROM_BEGIN, 0);
   int64_t size = file.GetLength();
   if (size <= 0) {
     OnRenderPDFPagesToMetafileDone(false);
     return false;
   }
   std::vector<char> data(size);
   if (file.ReadAtCurrentPos(data.data(), data.size()) != size) {
     OnRenderPDFPagesToMetafileDone(false);
     return false;
   }
-  if (!OnRenderPDFPagesToMetafilePageDone(data, scale_factor)) {
+  printing::Emf emf;
+  if (!emf.InitFromData(data.data(), data.size())) {
     OnRenderPDFPagesToMetafileDone(false);
     return false;
   }
+  OnRenderPDFPagesToMetafilePageDone(scale_factor, emf);
   return true;
 }