Eliminate InterfaceRegistry

ios/web/webui/mojo_facade_unittest.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.
 
 #import "ios/web/webui/mojo_facade.h"
 
 #include <memory>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
 #include "ios/web/public/test/web_test.h"
 #import "ios/web/public/web_state/js/crw_js_injection_evaluator.h"
+#include "ios/web/public/web_state/web_state_interface_provider.h"
 #include "ios/web/test/mojo_test.mojom.h"
+#include "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_factory.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #import "testing/gtest_mac.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 namespace web {
 
 namespace {
 
 // Serializes the given |object| to JSON string.
 std::string GetJson(id object) {
   NSData* json_as_data =
@@ skipping 24 matching lines @@
   void Create(const service_manager::Identity& remote_identity,
               mojo::InterfaceRequest<TestUIHandlerMojo> request) override {}
 };
 
 }  // namespace
 
 // A test fixture to test MojoFacade class.
 class MojoFacadeTest : public WebTest {
  protected:
   MojoFacadeTest() {
-    interface_registry_.reset(
-        new service_manager::InterfaceRegistry(std::string()));
-    interface_registry_->AddInterface(&ui_handler_factory_);
+    interface_provider_ = base::MakeUnique<WebStateInterfaceProvider>();
+    interface_provider_->registry()->AddInterface(&ui_handler_factory_);
     evaluator_.reset([[OCMockObject
         mockForProtocol:@protocol(CRWJSInjectionEvaluator)] retain]);
     facade_.reset(new MojoFacade(
-        interface_registry_.get(),
+        interface_provider_.get(),
         static_cast<id<CRWJSInjectionEvaluator>>(evaluator_.get())));
   }
 
   OCMockObject* evaluator() { return evaluator_.get(); }
   MojoFacade* facade() { return facade_.get(); }
 
  private:
   TestUIHandlerFactory ui_handler_factory_;
-  std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_;
+  std::unique_ptr<WebStateInterfaceProvider> interface_provider_;
   base::scoped_nsobject<OCMockObject> evaluator_;
   std::unique_ptr<MojoFacade> facade_;
 };
 
 // Tests connecting to existing interface and closing the handle.
 TEST_F(MojoFacadeTest, GetInterfaceAndCloseHandle) {
   // Bind to the interface.
   NSDictionary* connect = @{
     @"name" : @"interface_provider.getInterface",
     @"args" : @{
@@ skipping 193 matching lines @@
   NSDictionary* message = GetObject(facade()->HandleMojoMessage(GetJson(read)));
   EXPECT_TRUE([message isKindOfClass:[NSDictionary class]]);
   EXPECT_TRUE(message);
   NSArray* expected_message = @[ @9, @2, @216 ];  // 2008 does not fit 8-bit.
   EXPECT_NSEQ(expected_message, message[@"buffer"]);
   EXPECT_FALSE([message[@"handles"] count]);
   EXPECT_EQ(MOJO_RESULT_OK, [message[@"result"] unsignedIntValue]);
 }
 
 }  // namespace web