Change RenderFrame to use InterfaceRegistry et al.

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 <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "build/build_config.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/image_decoder_impl.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"
 #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/bsdiff.h"
 #include "ipc/ipc_channel.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/gfx/geometry/size.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/common/resource_usage_reporter.mojom.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #endif
@@ skipping 144 matching lines @@
     // |handlers_| to become invalid. Therefore, it is necessary to break the
     // loop at this point instead of evaluating it as a loop condition (if the
     // for loop was using iterators explicitly, as originally done).
     if (handler->OnMessageReceived(message))
       return true;
   }
 
   return false;
 }
 
-void ChromeContentUtilityClient::RegisterMojoServices(
-    content::ServiceRegistry* registry) {
+void ChromeContentUtilityClient::RegisterMojoInterfaces(
+    shell::InterfaceRegistry* registry) {
   // When the utility process is running with elevated privileges, we need to
   // filter messages so that only a whitelist of IPCs can run. In Mojo, there's
   // no way of filtering individual messages. Instead, we can avoid adding
-  // non-whitelisted Mojo services to the ServiceRegistry.
+  // non-whitelisted Mojo services to the shell::InterfaceRegistry.
   // TODO(amistry): Use a whitelist once the whistlisted IPCs have been
   // converted to Mojo.
   if (filter_messages_)
     return;
 
 #if !defined(OS_ANDROID)
-  registry->AddService<net::interfaces::ProxyResolverFactory>(
+  registry->AddInterface<net::interfaces::ProxyResolverFactory>(
       base::Bind(CreateProxyResolverFactory));
-  registry->AddService(base::Bind(CreateResourceUsageReporter));
+  registry->AddInterface(base::Bind(CreateResourceUsageReporter));
 #endif
-  registry->AddService(base::Bind(&CreateImageDecoder));
-  registry->AddService(base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
+  registry->AddInterface(base::Bind(&CreateImageDecoder));
+  registry->AddInterface(
+      base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
 }
 
 void ChromeContentUtilityClient::AddHandler(
     std::unique_ptr<UtilityMessageHandler> handler) {
   handlers_.push_back(std::move(handler));
 }
 
 // static
 void ChromeContentUtilityClient::PreSandboxStartup() {
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 83 matching lines @@
   safe_browsing::zip_analyzer::Results results;
   safe_browsing::dmg::AnalyzeDMGFile(
       IPC::PlatformFileForTransitToFile(dmg_file), &results);
   Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
       results));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_MACOSX)
 
 #endif  // defined(FULL_SAFE_BROWSING)