Change RenderFrame to use InterfaceRegistry et al.

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 3c260e19ae36b8f38aabc59087bce4a10651279c..00bb08d657ffae21a4f551bd588c718543fffaf8 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -21,11 +21,11 @@
 #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"
 
@@ -190,24 +190,25 @@ bool ChromeContentUtilityClient::OnMessageReceived(
   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(