Eliminate InterfaceRegistry

ios/web/webui/web_ui_mojo_inttest.mm

 // Copyright 2016 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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #import "base/test/ios/wait_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #import "ios/web/public/navigation_manager.h"
+#include "ios/web/public/web_state/web_state_interface_provider.h"
 #include "ios/web/public/web_ui_ios_data_source.h"
 #include "ios/web/public/webui/web_ui_ios_controller.h"
 #include "ios/web/public/webui/web_ui_ios_controller_factory.h"
 #include "ios/web/test/grit/test_resources.h"
 #include "ios/web/test/mojo_test.mojom.h"
 #include "ios/web/test/test_url_constants.h"
 #import "ios/web/test/web_int_test.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/web_state_impl.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/identity.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "url/gurl.h"
 #include "url/scheme_host_port.h"
 
 namespace web {
 
 namespace {
 
 // Hostname for test WebUI page.
 const char kTestWebUIURLHost[] = "testwebui";
 
@@ skipping 62 matching lines @@
         web::WebUIIOSDataSource::Create(kTestWebUIURLHost);
 
     source->AddResourcePath("mojo_test.js", IDR_MOJO_TEST_JS);
     source->AddResourcePath("ios/web/test/mojo_test.mojom",
                             IDR_MOJO_TEST_MOJO_JS);
     source->SetDefaultResource(IDR_MOJO_TEST_HTML);
 
     web::WebState* web_state = web_ui->GetWebState();
     web::WebUIIOSDataSource::Add(web_state->GetBrowserState(), source);
 
-    web_state->GetMojoInterfaceRegistry()->AddInterface(ui_handler);
+    web_state->GetWebStateInterfaceProvider()->registry()->AddInterface(
+        ui_handler);
   }
 };
 
 // Factory that creates TestUI controller.
 class TestWebUIControllerFactory : public WebUIIOSControllerFactory {
  public:
   // Constructs a controller factory which will eventually create |ui_handler|.
   explicit TestWebUIControllerFactory(TestUIHandler* ui_handler)
       : ui_handler_(ui_handler) {}
 
@@ skipping 53 matching lines @@
     // of this hack.
     base::RunLoop loop;
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   loop.QuitClosure());
     loop.Run();
     return test_ui_handler()->IsFinReceived();
   });
 }
 
 }  // namespace web