Change RenderFrame to use InterfaceRegistry et al.

chrome/browser/chrome_content_browser_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/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2704 matching lines @@
 }
 #endif  // defined(OS_WIN)
 
 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices(
     content::ServiceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddService(
       base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create));
 }
 
-void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
-    content::ServiceRegistry* registry,
+void ChromeContentBrowserClient::RegisterFrameMojoShellInterfaces(
+    shell::InterfaceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
 #if defined(OS_CHROMEOS)
-  registry->AddService(
+  registry->AddInterface(
       base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
                  render_frame_host));
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_MOJO_MEDIA)
-  registry->AddService(
+  registry->AddInterface(
       base::Bind(&OutputProtectionImpl::Create, render_frame_host));
 #endif  // defined(ENABLE_MOJO_MEDIA)
 }
 
-void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
-    content::ServiceRegistry* registry,
+void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
+    shell::InterfaceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
   // WebUSB is an experimental web API. It will only work if the experiment
   // is enabled and WebUSB feature is enabled. It should also not be available
   // to apps and extensions.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalWebPlatformFeatures) &&
       base::FeatureList::IsEnabled(features::kWebUsb)
 #if defined(ENABLE_EXTENSIONS)
       &&
       !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
           extensions::kExtensionScheme)
 #endif
           ) {
-    registry->AddService(
+    registry->AddInterface(
         base::Bind(&CreateUsbDeviceManager, render_frame_host));
-    registry->AddService(
+    registry->AddInterface(
         base::Bind(&CreateWebUsbChooserService, render_frame_host));
   }
 
   // Register mojo CredentialManager service only for main frame.
   if (!render_frame_host->GetParent()) {
-    registry->AddService(
+    registry->AddInterface(
         base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
                    render_frame_host));
   }
 
-  registry->AddService(
+  registry->AddInterface(
       base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
                  render_frame_host));
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(
+  ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces(
       registry, render_frame_host);
 #endif
 }
 
 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
     StaticMojoApplicationMap* apps) {
 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
   content::MojoApplicationInfo app_info;
   app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication);
   apps->insert(std::make_pair("mojo:media", app_info));
@@ skipping 172 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)