Eliminate InterfaceRegistry

ios/web/web_state/web_state_impl.mm

 // Copyright 2013 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.
 
 #import "ios/web/web_state/web_state_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 #include "ios/web/public/web_thread.h"
 #include "ios/web/public/webui/web_ui_ios_controller.h"
 #include "ios/web/web_state/global_web_state_event_tracker.h"
 #include "ios/web/web_state/navigation_context_impl.h"
 #import "ios/web/web_state/session_certificate_policy_cache_impl.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
 #include "ios/web/webui/web_ui_ios_controller_factory_registry.h"
 #include "ios/web/webui/web_ui_ios_impl.h"
 #include "net/http/http_response_headers.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 
 namespace web {
 
+WebStateInterfaceProvider::WebStateInterfaceProvider() : binding_(this) {}
+WebStateInterfaceProvider::~WebStateInterfaceProvider() = default;
+
+void WebStateInterfaceProvider::Bind(
+    service_manager::mojom::InterfaceProviderRequest request) {
+  binding_.Bind(std::move(request));
+}
+
+void WebStateInterfaceProvider::GetInterface(
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle handle) override {
+  registry_.BindInterface(service_manager::Identity(), interface_name,
+                          std::move(handle));
+}
+
 /* static */
 std::unique_ptr<WebState> WebState::Create(const CreateParams& params) {
   std::unique_ptr<WebStateImpl> web_state(new WebStateImpl(params));
 
   // Initialize the new session.
   web_state->GetNavigationManagerImpl().InitializeSession();
 
   // TODO(crbug.com/703565): remove std::move() once Xcode 9.0+ is required.
   return std::move(web_state);
 }
@@ skipping 480 matching lines @@
 bool WebStateImpl::ShouldAllowResponse(NSURLResponse* response) {
   for (auto& policy_decider : policy_deciders_) {
     if (!policy_decider.ShouldAllowResponse(response))
       return false;
   }
   return true;
 }
 
 #pragma mark - RequestTracker management
 
-service_manager::InterfaceRegistry* WebStateImpl::GetMojoInterfaceRegistry() {
-  if (!mojo_interface_registry_) {
-    mojo_interface_registry_ =
-        base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
+WebStateInterfaceProvider* WebStateImpl::GetWebStateInterfaceProvider() {
+  if (!web_state_interface_provider_) {
+    web_state_interface_provider_ =
+        base::MakeUnique<WebStateInterfaceProvider>();
   }
-  return mojo_interface_registry_.get();
+  return web_state_interface_provider_.get();
 }
 
 base::WeakPtr<WebState> WebStateImpl::AsWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 #pragma mark - WebState implementation
 
 bool WebStateImpl::IsWebUsageEnabled() const {
   return [web_controller_ webUsageEnabled];
@@ skipping 168 matching lines @@
     const LoadCommittedDetails& load_details) {
   for (auto& observer : observers_)
     observer.NavigationItemCommitted(load_details);
 }
 
 WebState* WebStateImpl::GetWebState() {
   return this;
 }
 
 }  // namespace web