Convert utility process ImageWriter IPC to mojo

chrome/utility/chrome_content_utility_client.cc

Index: chrome/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 8fcd114315a27d1afb5b2fbcc241732938c23e0f..6ae74ae6ce35a296cbe460f876a50a210b01bb04 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -17,7 +17,6 @@
 #include "chrome/common/file_patcher.mojom.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "chrome/common/safe_browsing/zip_analyzer_results.h"
-#include "chrome/utility/chrome_content_utility_ipc_whitelist.h"
 #include "chrome/utility/utility_message_handler.h"
 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
 #include "content/public/child/image_decoder_utils.h"
@@ -51,7 +50,6 @@
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/utility/extensions/extensions_handler.h"
-#include "chrome/utility/image_writer/image_writer_handler.h"
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
@@ -148,11 +146,9 @@ std::unique_ptr<service_manager::Service> CreateImageDecoderService() {
 
 }  // namespace
 
-ChromeContentUtilityClient::ChromeContentUtilityClient()
-    : filter_messages_(false) {
+ChromeContentUtilityClient::ChromeContentUtilityClient() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   handlers_.push_back(new extensions::ExtensionsHandler());
-  handlers_.push_back(new image_writer::ImageWriterHandler());
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
@@ -172,24 +168,10 @@ void ChromeContentUtilityClient::UtilityThreadStarted() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   extensions::UtilityHandler::UtilityThreadStarted();
 #endif
-
-  if (kMessageWhitelistSize > 0) {
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(switches::kUtilityProcessRunningElevated)) {
-      message_id_whitelist_.insert(kMessageWhitelist,
-                                   kMessageWhitelist + kMessageWhitelistSize);
-      filter_messages_ = true;
-    }
-  }
 }
 
 bool ChromeContentUtilityClient::OnMessageReceived(
     const IPC::Message& message) {

[Sam McNally, 2017/02/02 21:54:17]

Shouldn't this always just return false if running elevated?

[Noel Gordon, 2017/02/03 13:54:56]

Yeap, just checking you ain't jet-lagged.  Added
utility_process_running_elevated_ and used it where filter_messages_ was before.

-  if (filter_messages_ &&
-      !base::ContainsKey(message_id_whitelist_, message.type())) {
-    return false;
-  }
-
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeContentUtilityClient, message)
 #if defined(FULL_SAFE_BROWSING)