Change RenderFrame to use InterfaceRegistry et al.

content/utility/utility_thread_impl.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 "content/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "content/child/blink_platform_impl.h"
 #include "content/child/child_process.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/utility_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/utility/content_utility_client.h"
 #include "content/utility/utility_blink_platform_impl.h"
 #include "content/utility/utility_process_control_impl.h"
 #include "ipc/ipc_sync_channel.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
 #if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
 #include "base/files/file_path.h"
 #include "content/common/plugin_list.h"
 #endif
 
 namespace content {
 
 namespace {
@@ skipping 57 matching lines @@
   blink_platform_impl_.reset(new UtilityBlinkPlatformImpl);
   blink::Platform::initialize(blink_platform_impl_.get());
 }
 
 void UtilityThreadImpl::Init() {
   batch_mode_ = false;
   ChildProcess::current()->AddRefProcess();
   GetContentClient()->utility()->UtilityThreadStarted();
 
   process_control_.reset(new UtilityProcessControlImpl);
-  service_registry()->AddService(base::Bind(
+  interface_registry()->AddInterface(base::Bind(
       &UtilityThreadImpl::BindProcessControlRequest, base::Unretained(this)));
 
-  GetContentClient()->utility()->RegisterMojoServices(service_registry());
+  GetContentClient()->utility()->RegisterMojoInterfaces(interface_registry());
 }
 
 bool UtilityThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   if (GetContentClient()->utility()->OnMessageReceived(msg))
     return true;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(UtilityThreadImpl, msg)
     IPC_MESSAGE_HANDLER(UtilityMsg_BatchMode_Started, OnBatchModeStarted)
     IPC_MESSAGE_HANDLER(UtilityMsg_BatchMode_Finished, OnBatchModeFinished)
@@ skipping 12 matching lines @@
 }
 
 void UtilityThreadImpl::BindProcessControlRequest(
     mojo::InterfaceRequest<mojom::ProcessControl> request) {
   DCHECK(process_control_);
   process_control_bindings_.AddBinding(process_control_.get(),
                                        std::move(request));
 }
 
 }  // namespace content