Turn the utility process image decoder into a Mojo service.

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_utility_messages.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/image_decoder/image_decoder_impl.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/utility/utility_thread.h"
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff.h"
 #include "ipc/ipc_channel.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/google/zip.h"
@@ skipping 44 matching lines @@
 void FinishParseMediaMetadata(
     metadata::MediaMetadataParser* /* parser */,
     const extensions::api::media_galleries::MediaMetadata& metadata,
     const std::vector<metadata::AttachedImage>& attached_images) {
   Send(new ChromeUtilityHostMsg_ParseMediaMetadata_Finished(
       true, *metadata.ToValue(), attached_images));
   ReleaseProcessIfNeeded();
 }
 #endif
 
-#if !defined(OS_ANDROID)
-void CreateProxyResolverFactory(
-    mojo::InterfaceRequest<net::interfaces::ProxyResolverFactory> request) {
-  // MojoProxyResolverFactoryImpl is strongly bound to the Mojo message pipe it
-  // is connected to. When that message pipe is closed, either explicitly on the
-  // other end (in the browser process), or by a connection error, this object
-  // will be destroyed.
-  new net::MojoProxyResolverFactoryImpl(request.Pass());
+template <class Interface, class Impl>
+void CreateMojoService(mojo::InterfaceRequest<Interface> request) {
+  // The Mojo service implementation is assumed to use a StrongBinding<>, which
+  // causes the implementation to be deleted automatically when the Mojo
+  // connection is closed.
+  new Impl(request.Pass());
 }
-#endif  // OS_ANDROID
 
 }  // namespace
 
 int64_t ChromeContentUtilityClient::max_ipc_message_size_ =
     IPC::Channel::kMaximumMessageSize;
 
 ChromeContentUtilityClient::ChromeContentUtilityClient()
     : filter_messages_(false) {
 #if !defined(OS_ANDROID)
   handlers_.push_back(new ProfileImportHandler());
@@ skipping 78 matching lines @@
     handled = (*it)->OnMessageReceived(message);
   }
 
   return handled;
 }
 
 void ChromeContentUtilityClient::RegisterMojoServices(
     content::ServiceRegistry* registry) {
 #if !defined(OS_ANDROID)
   registry->AddService<net::interfaces::ProxyResolverFactory>(
-      base::Bind(CreateProxyResolverFactory));
+      base::Bind(CreateMojoService<net::interfaces::ProxyResolverFactory,
+                                   net::MojoProxyResolverFactoryImpl>));
 #endif
+  registry->AddService<image_decoder::ImageDecoder>(base::Bind(
+      CreateMojoService<image_decoder::ImageDecoder,
+                        image_decoder::ImageDecoderImpl>));
 }
 
 // static
 void ChromeContentUtilityClient::PreSandboxStartup() {
 #if defined(ENABLE_EXTENSIONS)
   extensions::ExtensionsHandler::PreSandboxStartup();
 #endif
 
 #if defined(ENABLE_MDNS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 201 matching lines @@
     const std::string& mime_type, int64 total_size, bool get_attached_images) {
   // Only one IPCDataSource may be created and added to the list of handlers.
   metadata::IPCDataSource* source = new metadata::IPCDataSource(total_size);
   handlers_.push_back(source);
 
   metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser(
       source, mime_type, get_attached_images);
   parser->Start(base::Bind(&FinishParseMediaMetadata, base::Owned(parser)));
 }
 #endif