clean up printing::Image and printing::Metafile

chrome/service/service_utility_process_host.cc

Index: chrome/service/service_utility_process_host.cc
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
index 7a9edf70f2959693b0c869fe94831dcc426dfdfa..a9769ed054d0423df356fd5b60cff0f5e3067af7 100644
--- a/chrome/service/service_utility_process_host.cc
+++ b/chrome/service/service_utility_process_host.cc
@@ -37,7 +37,6 @@
 #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"
@@ -429,6 +428,12 @@ void ServiceUtilityProcessHost::OnGetPrinterSemanticCapsAndDefaultsFailed(
                             printing::PrinterSemanticCapsAndDefaults()));
 }
 
+bool ServiceUtilityProcessHost::OnRenderPDFPagesToMetafilePageDone(
+    const std::vector<char>&,

[Lei Zhang, 2017/04/13 21:21:20]

We usually write out the parameter name. Comment it out if it's unused. e.g.

const std::vector<char>& /* emf_data */,

+    float) {
+  return false;
+}
+
 bool ServiceUtilityProcessHost::Client::MetafileAvailable(float scale_factor,
                                                           base::File file) {
   file.Seek(base::File::FROM_BEGIN, 0);
@@ -442,11 +447,9 @@ bool ServiceUtilityProcessHost::Client::MetafileAvailable(float scale_factor,
     OnRenderPDFPagesToMetafileDone(false);
     return false;
   }
-  printing::Emf emf;
-  if (!emf.InitFromData(data.data(), data.size())) {
+  if (!OnRenderPDFPagesToMetafilePageDone(data, scale_factor)) {
     OnRenderPDFPagesToMetafileDone(false);
     return false;
   }
-  OnRenderPDFPagesToMetafilePageDone(scale_factor, emf);
   return true;
 }