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

chrome/service/service_utility_process_host.h

 // 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.
 
 #ifndef CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_
 #define CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/common/child_process_host_delegate.h"
 #include "ipc/ipc_platform_file.h"
 #include "mojo/edk/embedder/pending_process_connection.h"
 
 namespace base {
 class CommandLine;
 class File;
 class FilePath;
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace content {
 class ChildProcessHost;
 }
 
 namespace printing {
+class MetafilePlayer;
 struct PdfRenderSettings;
 struct PrinterCapsAndDefaults;
 struct PrinterSemanticCapsAndDefaults;
 }  // namespace printing
 
 // Acts as the service-side host to a utility child process. A
 // utility process is a short-lived sandboxed process that is created to run
 // a specific task.
 class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
  public:
   // Consumers of ServiceUtilityProcessHost must implement this interface to
   // get results back.  All functions are called on the thread passed along
   // to ServiceUtilityProcessHost.
   class Client : public base::RefCountedThreadSafe<Client> {
    public:
     Client() {}
 
     // Called when the child process died before a reply was receieved.
     virtual void OnChildDied() {}
 
-    virtual bool OnRenderPDFPagesToMetafilePageDone(
-        const std::vector<char>& emf_data,
-        float scale_factor);
+    virtual void OnRenderPDFPagesToMetafilePageDone(
+        float scale_factor,
+        const printing::MetafilePlayer& emf) {}
 
     // Called when at all pages in the PDF has been rendered.
     virtual void OnRenderPDFPagesToMetafileDone(bool success) {}
 
     // Called when the printer capabilities and defaults have been
     // retrieved successfully or if retrieval failed.
     virtual void OnGetPrinterCapsAndDefaults(
         bool succedded,
         const std::string& printer_name,
         const printing::PrinterCapsAndDefaults& caps_and_defaults) {}
@@ skipping 90 matching lines @@
 
   class PdfToEmfState;
   std::unique_ptr<PdfToEmfState> pdf_to_emf_state_;
 
   base::WeakPtrFactory<ServiceUtilityProcessHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceUtilityProcessHost);
 };
 
 #endif  // CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_