Revise InterfaceRegistry API to support filtering interfaces @ Bind() time.

services/service_manager/public/cpp/tests/interface_registry_unittest.cc

Index: services/service_manager/public/cpp/tests/interface_registry_unittest.cc
diff --git a/services/service_manager/public/cpp/tests/interface_registry_unittest.cc b/services/service_manager/public/cpp/tests/interface_registry_unittest.cc
index bf342abc58baabdba51a264b0c7ada30b2b72314..83e46bc9245f37cad27b42fce0b7acec254738a3 100644
--- a/services/service_manager/public/cpp/tests/interface_registry_unittest.cc
+++ b/services/service_manager/public/cpp/tests/interface_registry_unittest.cc
@@ -9,8 +9,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace service_manager {
-namespace internal {
-namespace {
 
 class TestBinder : public InterfaceBinder {
  public:
@@ -30,15 +28,17 @@ TEST(InterfaceRegistryTest, Ownership) {
 
   // Destruction.
   {
-    InterfaceRegistry registry;
-    InterfaceRegistry::TestApi test_api(&registry);
+    auto registry = base::MakeUnique<service_manager::InterfaceRegistry>(
+        Identity(), InterfaceProviderSpec());
+    InterfaceRegistry::TestApi test_api(registry.get());
     test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
   }
   EXPECT_EQ(1, delete_count);
 
   // Removal.
   {
-    std::unique_ptr<InterfaceRegistry> registry(new InterfaceRegistry);
+    auto registry = base::MakeUnique<InterfaceRegistry>(
+        Identity(), InterfaceProviderSpec());
     InterfaceBinder* b = new TestBinder(&delete_count);
     InterfaceRegistry::TestApi test_api(registry.get());
     test_api.SetInterfaceBinderForName(b, "TC1");
@@ -49,8 +49,9 @@ TEST(InterfaceRegistryTest, Ownership) {
 
   // Multiple.
   {
-    InterfaceRegistry registry;
-    InterfaceRegistry::TestApi test_api(&registry);
+    auto registry = base::MakeUnique<service_manager::InterfaceRegistry>(
+        Identity(), InterfaceProviderSpec());
+    InterfaceRegistry::TestApi test_api(registry.get());
     test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
     test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC2");
   }
@@ -58,8 +59,9 @@ TEST(InterfaceRegistryTest, Ownership) {
 
   // Re-addition.
   {
-    InterfaceRegistry registry;
-    InterfaceRegistry::TestApi test_api(&registry);
+    auto registry = base::MakeUnique<service_manager::InterfaceRegistry>(
+        Identity(), InterfaceProviderSpec());
+    InterfaceRegistry::TestApi test_api(registry.get());
     test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
     test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
     EXPECT_EQ(5, delete_count);
@@ -67,6 +69,4 @@ TEST(InterfaceRegistryTest, Ownership) {
   EXPECT_EQ(6, delete_count);
 }
 
-}  // namespace
-}  // namespace internal
 }  // namespace service_manager