Convert "all_users" and "singleton" capabilities to options

This change updates the service_manager::Instance code to reference its
options_.instance_sharing value instead of "service_manager:all_users"
and "service_manager:singleton" in the "required" section of its
interface provider specs.
Tests and existing manifests were updated accordingly.

Bug: 866967
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win10_chromium_x64_rel_ng
Change-Id: I699ec3411b7ec84023fbb56f85186ad5519515c4
Reviewed-on: https://chromium-review.googlesource.com/1195892Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587809}

ash/manifest.json

@@ -2,6 +2,9 @@
   "name": "ash",
   "display_name": "Ash Window Manager and Shell",
   "sandbox_type": "none",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -68,7 +71,6 @@
         "local_state": [ "pref_client" ],
         "multidevice_setup": [ "multidevice_setup" ],
         "quick_launch_app": [ "mash:launchable" ],
-        "service_manager": [ "service_manager:singleton" ],
         "ui": [
           "ozone",
           "window_manager"

chrome/app/chrome_manifest.json

 {
   "name": "chrome",
   "display_name": "Chrome",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -21,7 +24,6 @@
       "requires": {
         "chrome_renderer": [ "browser" ],
         "service_manager": [
-          "service_manager:all_users",
           "service_manager:client_process",
           "service_manager:instance_name"
         ]

chrome/browser/android/download/manifest.json

@@ -3,12 +3,14 @@
 {
   "name": "download_manager",
   "display_name": "Download Manager",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {},
       "requires": {
-        "network": [ "network_service"],
-        "service_manager": [ "service_manager:singleton" ]
+        "network": [ "network_service"]
       }
     }
   }

chrome/services/cups_ipp_validator/manifest.json

 {
   "name": "cups_ipp_validator",
   "display_name": "CUPS IPP Validator",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "sandbox_type": "utility",
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "ipp_validator": [ "chrome.mojom.IppValidator" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/file_util/manifest.json

@@ -2,14 +2,14 @@
   "name": "file_util",
   "display_name": "Chrome File Utilities",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "analyze_archive": [ "chrome.mojom.SafeArchiveAnalyzer" ],
         "zip_file": [ "chrome.mojom.ZipFileCreator" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/media_gallery_util/manifest.json

@@ -2,13 +2,13 @@
   "name": "media_gallery_util",
   "display_name": "Chrome Media Gallery Utilities",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "parse_media": [ "chrome.mojom.MediaParserFactory" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/printing/manifest.json

@@ -2,6 +2,9 @@
   "name": "chrome_printing",
   "display_name": "Printing",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -9,9 +12,6 @@
             "printing.mojom.PdfNupConverter",
             "printing.mojom.PdfToEmfConverterFactory",
             "printing.mojom.PdfToPwgRasterConverter" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/removable_storage_writer/manifest.json

@@ -2,13 +2,13 @@
   "name": "removable_storage_writer",
   "display_name": "Removable Storage Writer",
   "sandbox_type": "none_and_elevated",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "removable_storage_writer": [ "chrome.mojom.RemovableStorageWriter" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/util_win/manifest.json

@@ -2,13 +2,13 @@
   "name": "util_win",
   "display_name": "Windows Utilities",
   "sandbox_type": "none",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "shell_util_win": [ "chrome.mojom.ShellUtilWin" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/services/wifi_util_win/manifest.json

@@ -2,13 +2,13 @@
   "name": "wifi_util_win",
   "display_name": "Windows WiFi Utilities",
   "sandbox_type": "none_and_elevated",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "wifi_credentials": [ "chrome.mojom.WiFiCredentialsGetter" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chrome/utility/importer/profile_import_manifest.json

@@ -2,13 +2,13 @@
   "name": "profile_import",
   "display_name": "Profile Import",
   "sandbox_type": "none",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "import": [ "chrome.mojom.ProfileImport" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

chromeos/services/assistant/audio_decoder/manifest.json

@@ -2,13 +2,13 @@
   "name": "assistant_audio_decoder",
   "display_name": "Assistant Audio Decoder Service",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "assistant:audio_decoder": [ "chromeos.assistant.mojom.AssistantAudioDecoderFactory" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

chromeos/services/ime/manifest.json

@@ -2,6 +2,9 @@
   "name": "ime",
   "display_name": "IME",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -9,9 +12,6 @@
           "chromeos.ime.mojom.InputEngineManager",
           "chromeos.ime.mojom.InputChannel"
         ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

chromeos/services/secure_channel/manifest.json

 {
   "name": "secure_channel",
   "display_name": "SecureChannel Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "secure_channel": [ "chromeos.secure_channel.mojom.SecureChannel" ]
-       },
-       "requires": {
-        "service_manager": [ "service_manager:all_users" ]
-      }
+       }
      }
   }
 }

components/services/font/manifest.json

@@ -2,13 +2,13 @@
   "name": "font_service",
   "display_name": "Font Service",
   "sandbox_type": "none",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "font_service": [ "font_service.mojom.FontService" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

components/services/heap_profiling/heap_profiling_manifest.json

@@ -2,6 +2,9 @@
   "name": "heap_profiling",
   "display_name": "Heap Profiling Service",
   "sandbox_type": "profiling",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -10,8 +13,7 @@
       },
       "requires": {
         "*": [ "app" ],
-        "resource_coordinator": [ "heap_profiler_helper" ],
-        "service_manager": [ "service_manager:all_users" ]
+        "resource_coordinator": [ "heap_profiler_helper" ]
       }
     }
   }

components/services/patch/manifest.json

@@ -2,13 +2,13 @@
   "name": "patch_service",
   "display_name": "Patch Service",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "patch_file": [ "patch.mojom.FilePatcher" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

components/services/pdf_compositor/pdf_compositor_manifest.json

@@ -2,6 +2,9 @@
   "name": "pdf_compositor",
   "display_name": "PDF Compositor Service",
   "sandbox_type": "pdf_compositor",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -10,7 +13,6 @@
        "requires": {
          "*": [ "app" ],
          "content_browser": [ "font_loader" ],
-         "service_manager": [ "service_manager:all_users" ],
          "ui": [ "discardable_memory" ]
        }
      }

components/services/unzip/manifest.json

@@ -2,13 +2,13 @@
   "name": "unzip_service",
   "display_name": "Unzip Service",
   "sandbox_type": "utility",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "unzip_file": [ "unzip.mojom.Unzipper" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

content/public/app/mojo/content_packaged_services_manifest.json

@@ -8,6 +8,9 @@
 {
   "name": "content_packaged_services",
   "display_name": "Content Packaged Services",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -20,7 +23,6 @@
         "content_browser": [],
         "service_manager": [
           "service_manager:client_process",
-          "service_manager:singleton",
           "service_manager:user_id"
         ]
       }

ios/web/public/app/mojo/web_packaged_services_manifest.json

@@ -8,6 +8,9 @@
 {
   "name": "web_packaged_services",
   "display_name": "Web Packaged Services",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -18,7 +21,6 @@
       "requires": {
         "web_browser": [],
         "service_manager": [
-          "service_manager:all_users",
           "service_manager:client_process",
           "service_manager:user_id"
         ]

services/audio/manifest.json

@@ -2,6 +2,9 @@
   "name": "audio",
   "display_name": "Audio",
   "sandbox_type": "audio",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -11,9 +14,6 @@
         "device_notifier": [ "audio.mojom.DeviceNotifier" ],
         "log_factory_manager": [ "audio.mojom.LogFactoryManager" ],
         "testing_api": [ "audio.mojom.TestingApi" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/catalog/manifest.json

 {
   "name": "catalog",
   "display_name": "Application Resolver",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     // NOTE: This manifest is for documentation purposes only. Relevant
     // capability spec is defined inline in the ServiceManager implementation.
@@ -11,9 +14,6 @@
       "provides": {
         "directory": [ "filesystem.mojom.Directory" ],
         "control": [ "catalog.mojom.CatalogControl" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/data_decoder/manifest.json

 {
   "name": "data_decoder",
   "display_name": "Data Decoder Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "image_decoder": [ "data_decoder.mojom.ImageDecoder" ],
         "json_parser": [ "data_decoder.mojom.JsonParser" ],
         "xml_parser": [ "data_decoder.mojom.XmlParser" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/device/manifest.json

 {
   "name": "device",
   "display_name": "Device Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -24,9 +27,6 @@
         "device:time_zone_monitor": [ "device.mojom.TimeZoneMonitor" ],
         "device:vibration": [ "device.mojom.VibrationManager" ],
         "device:wake_lock": [ "device.mojom.WakeLockProvider" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/media_session/manifest.json

 {
   "name": "media_session",
   "display_name": "Media Session Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -8,11 +11,6 @@
           "media_session.mojom.AudioFocus"
         ],
         "tests": [ "*" ]
-      },
-      "requires": {
-        "service_manager": [
-          "service_manager:all_users"
-        ]
       }
     }
   }

services/metrics/manifest.json

 {
   "name": "metrics",
   "display_name": "Metrics Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "url_keyed_metrics": [
           "ukm.mojom.UkmRecorderInterface"
         ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/network/manifest.json

@@ -2,6 +2,9 @@
   "name": "network",
   "display_name": "Network Service",
   "sandbox_type": "network",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -14,9 +17,6 @@
         "url_loader": [
           "network.mojom.URLLoaderFactory"
         ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/proxy_resolver/manifest.json

 {
   "name": "proxy_resolver",
   "display_name": "Proxy resolver",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "factory": [ "proxy_resolver.mojom.ProxyResolverFactory" ]
-       },
-       "requires": {
-         "service_manager": [ "service_manager:all_users" ]
        }
      }
   }

services/resource_coordinator/manifest.json

 {
   "name": "resource_coordinator",
   "display_name": "Global Resource Coordinator",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -17,7 +20,6 @@
       },
       "requires": {
         "service_manager": [
-          "service_manager:all_users",
           "service_manager:service_manager"
         ],
         "metrics": [

services/service_manager/manifest.json

@@ -19,9 +19,6 @@
         // Clients requesting this class are allowed to connect to other clients
         // in specific process instance groups.
         "service_manager:instance_name": [ ],
-        // Clients requesting this class are run as a unique user id which is
-        // visible to clients run as any user.
-        "service_manager:all_users": [ ],
         "service_manager:block_wildcard": [ ],
 
         "service_manager:service_manager": [

services/service_manager/service_manager.cc

@@ -50,8 +50,6 @@ namespace {
 const char kCapability_UserID[] = "service_manager:user_id";
 const char kCapability_ClientProcess[] = "service_manager:client_process";
 const char kCapability_InstanceName[] = "service_manager:instance_name";
-const char kCapability_Singleton[] = "service_manager:singleton";
-const char kCapability_AllUsers[] = "service_manager:all_users";
 const char kCapability_ServiceManager[] = "service_manager:service_manager";
 
 bool Succeeded(mojom::ConnectResult result) {
@@ -115,20 +113,6 @@ Identity CreateCatalogIdentity() {
   return Identity(catalog::mojom::kServiceName, mojom::kRootUserID);
 }
 
-InterfaceProviderSpec CreatePermissiveInterfaceProviderSpec() {
-  InterfaceProviderSpec spec;
-  InterfaceSet interfaces;
-  interfaces.insert("*");
-  spec.requires["*"] = std::move(interfaces);
-  return spec;
-}
-
-const InterfaceProviderSpec& GetPermissiveInterfaceProviderSpec() {
-  CR_DEFINE_STATIC_LOCAL(InterfaceProviderSpec, spec,
-                         (CreatePermissiveInterfaceProviderSpec()));
-  return spec;
-}
-
 const InterfaceProviderSpec& GetEmptyInterfaceProviderSpec() {
   CR_DEFINE_STATIC_LOCAL(InterfaceProviderSpec, spec, ());
   return spec;
@@ -211,12 +195,12 @@ class ServiceManager::Instance
   Instance(service_manager::ServiceManager* service_manager,
            const Identity& identity,
            const InterfaceProviderSpecMap& interface_provider_specs,
-           // TODO(crbug.com/866967) this parameter will be used in the future
            const catalog::ServiceOptions& options)
       : service_manager_(service_manager),
         id_(GenerateUniqueID()),
         identity_(identity),
         interface_provider_specs_(interface_provider_specs),
+        options_(options),
         allow_any_application_(GetConnectionSpec().requires.count("*") == 1),
         pid_receiver_binding_(this),
         control_binding_(this),
@@ -493,6 +477,7 @@ class ServiceManager::Instance
     Identity target = in_target;
     mojom::ConnectResult result =
         ValidateConnectParams(&target, nullptr, nullptr, nullptr);
+
     if (!Succeeded(result)) {
       std::move(callback).Run(result, Identity());
       return;
@@ -624,8 +609,11 @@ class ServiceManager::Instance
     // whether this instance is allowed to connect using:
     // - non-null client process info.
     bool skip_user_check =
-        HasCapability(connection_spec, kCapability_Singleton) ||
-        HasCapability(connection_spec, kCapability_AllUsers) ||
+        options_.instance_sharing ==
+            catalog::ServiceOptions::InstanceSharingType::SINGLETON ||
+        options_.instance_sharing ==
+            catalog::ServiceOptions::InstanceSharingType::
+                SHARED_INSTANCE_ACROSS_USERS ||
         HasCapability(connection_spec, kCapability_UserID);
 
     if (!skip_user_check && target.user_id() != identity_.user_id() &&
@@ -729,6 +717,7 @@ class ServiceManager::Instance
   const uint32_t id_;
   Identity identity_;
   const InterfaceProviderSpecMap interface_provider_specs_;
+  const catalog::ServiceOptions options_;
   const bool allow_any_application_;
 #if !defined(OS_IOS)
   std::unique_ptr<ServiceProcessLauncher> runner_;
@@ -953,15 +942,12 @@ void ServiceManager::Connect(std::unique_ptr<ConnectParams> params) {
 
   const catalog::ServiceOptions& options = entry->options();
 
-  auto it = interface_provider_specs.find(mojom::kServiceManager_ConnectorSpec);
-  const InterfaceProviderSpec& connection_spec =
-      it != interface_provider_specs.end()
-          ? it->second
-          : GetPermissiveInterfaceProviderSpec();
-
-  bool all_user_instance = HasCapability(connection_spec, kCapability_AllUsers);
+  bool all_user_instance = entry->options().instance_sharing ==
+                           catalog::ServiceOptions::InstanceSharingType::
+                               SHARED_INSTANCE_ACROSS_USERS;
   bool singleton_instance =
-      HasCapability(connection_spec, kCapability_Singleton);
+      entry->options().instance_sharing ==
+      catalog::ServiceOptions::InstanceSharingType::SINGLETON;
   const Identity original_target(params->target());
 
   // Services that request "all_users" class from the Service Manager are

services/service_manager/tests/connect/connect_test_singleton_app_manifest.json

 {
   "name": "connect_test_singleton_app",
   "display_name": "Connect Test Singleton App",
+  "options": {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
-    "service_manager:connector": {
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
-      }
+    "service_manager:connector" : {
     }
   }
 }

services/service_manager/tests/service_manager/BUILD.gn

@@ -72,15 +72,15 @@ service_manifest("embedder_manifest") {
   name = "service_manager_unittest_embedder"
   source = "embedder_manifest.json"
   packaged_services = [
-    ":all_users_manifest",
+    ":shared_instance_across_users_manifest",
     ":regular_manifest",
     ":singleton_manifest",
   ]
 }
 
-service_manifest("all_users_manifest") {
-  name = "service_manager_unittest_all_users"
-  source = "all_users_manifest.json"
+service_manifest("shared_instance_across_users_manifest") {
+  name = "service_manager_unittest_shared_instance_across_users"
+  source = "shared_instance_across_users_manifest.json"
 }
 
 service_manifest("singleton_manifest") {

services/service_manager/tests/service_manager/OWNERS

@@ -7,9 +7,6 @@ per-file embedder_manifest.json=file://ipc/SECURITY_OWNERS
 per-file service_manager_unittest_manifest.json=set noparent
 per-file service_manager_unittest_manifest.json=file://ipc/SECURITY_OWNERS
 
-per-file all_users_manifest.json=set noparent
-per-file all_users_manifest.json=file://ipc/SECURITY_OWNERS
-
 per-file regular_manifest.json=set noparent
 per-file regular_manifest.json=file://ipc/SECURITY_OWNERS
 
@@ -18,3 +15,6 @@ per-file singleton_manifest.json=file://ipc/SECURITY_OWNERS
 
 per-file target_manifest.json=set noparent
 per-file target_manifest.json=file://ipc/SECURITY_OWNERS
+
+per-file shared_instance_across_users_manifest.json=set noparent
+per-file shared_instance_across_users_manifest.json=file://ipc/SECURITY_OWNERS
\ No newline at end of file

services/service_manager/tests/service_manager/all_users_manifest.json

-{
-  "name": "service_manager_unittest_all_users",
-  "display_name": "Service Manager Unittest: All users",
-  "interface_provider_specs": {
-    "service_manager:connector": {
-      "provides": {
-        "service_manager_unittest:all_users": [ ]
-      },
-      "requires": {
-        "service_manager_unittest_target": [ ],
-        "service_manager": [ "service_manager:all_users" ]
-      }
-    }
-  }
-}

services/service_manager/tests/service_manager/embedder.cc

@@ -92,7 +92,7 @@ class Embedder : public service_manager::Service,
       service_manager::mojom::ServiceRequest request,
       const std::string& name,
       service_manager::mojom::PIDReceiverPtr pid_receiver) override {
-    if (name == "service_manager_unittest_all_users") {
+    if (name == "service_manager_unittest_shared_instance_across_users") {
       context_.reset(new service_manager::ServiceContext(
           std::make_unique<AllUsersService>(), std::move(request)));
     } else if (name == "service_manager_unittest_singleton") {

services/service_manager/tests/service_manager/embedder_manifest.json

 {
   "name": "service_manager_unittest_embedder",
   "display_name": "Service Manager Unittest: Embedder",
+  "options": {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -10,7 +13,6 @@
         ]
       },
       "requires": {
-        "service_manager": [ "service_manager:singleton" ],
         "service_manager_unittest_target": [ ]
       }
     }

services/service_manager/tests/service_manager/service_manager_unittest.cc

@@ -466,7 +466,8 @@ TEST_F(ServiceManagerTest, CreatePackagedRegularInstances) {
 // starting that service again, a new service is created only when a different
 // instance name is specified.
 TEST_F(ServiceManagerTest, CreatePackagedAllUsersInstances) {
-  constexpr char kAllUsersServiceName[] = "service_manager_unittest_all_users";
+  constexpr char kAllUsersServiceName[] =
+      "service_manager_unittest_shared_instance_across_users";
 
   AddListenerAndWaitForApplications();
 

services/service_manager/tests/service_manager/service_manager_unittest_manifest.json

 {
   "name": "service_manager_unittest",
   "display_name": "Service Manager Unittest",
+  "options": {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -10,7 +13,6 @@
       },
       "requires": {
         "service_manager": [
-          "service_manager:singleton",
           "service_manager:service_manager",
           "service_manager:client_process",
           "service_manager:instance_name"
@@ -21,9 +23,7 @@
         "service_manager_unittest_singleton": [
           "service_manager_unittest:singleton"
         ],
-        "service_manager_unittest_all_users": [
-          "service_manager_unittest:all_users"
-        ],
+        "service_manager_unittest_shared_instance_across_users": [ ],
         "service_manager_unittest_regular": [
           "service_manager_unittest:regular"
         ],

services/service_manager/tests/service_manager/shared_instance_across_users_manifest.json

+{
+  "name": "service_manager_unittest_shared_instance_across_users",
+  "display_name": "Service Manager Unittest: Shared instance across users",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
+  "interface_provider_specs": {
+    "service_manager:connector": { }
+  }
+}

services/service_manager/tests/service_manager/singleton_manifest.json

 {
   "name": "service_manager_unittest_singleton",
   "display_name": "Service Manager Unittest: Singleton",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "service_manager_unittest:singleton": [ ]
       },
       "requires": {
-        "service_manager_unittest_target": [ ],
-        "service_manager": [ "service_manager:singleton" ]
+        "service_manager_unittest_target": [ ]
       }
     }
   }

services/shape_detection/manifest.json

 {
   "name": "shape_detection",
   "display_name": "Shape Detection Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "face_detection": [ "shape_detection.mojom.FaceDetectionProvider" ],
         "barcode_detection": [ "shape_detection.mojom.BarcodeDetectionProvider" ],
         "text_detection": [ "shape_detection.mojom.TextDetection" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/test/echo/manifest.json

 {
   "name": "echo",
   "display_name": "Echo Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "echo" : [ "echo.mojom.Echo" ]
-      },
-      "requires": {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/tracing/manifest.json

 {
   "name": "tracing",
   "display_name": "Tracing",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -13,7 +16,6 @@
       },
       "requires": {
         "service_manager": [
-          "service_manager:singleton",
           "service_manager:service_manager"
         ]
       }

services/video_capture/service_manifest.json

@@ -2,6 +2,9 @@
   "name": "video_capture",
   "display_name": "Video Capture",
   "sandbox_type": "none",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides" : {
@@ -10,9 +13,6 @@
           "video_capture.mojom.DeviceFactoryProvider",
           "video_capture.mojom.TestingControls"
         ]
-      },
-      "requires" : {
-        "service_manager": [ "service_manager:all_users" ]
       }
     }
   }

services/viz/manifest.json

@@ -8,6 +8,9 @@
   // fixed.
   "sandbox_type": "none",
   "display_name": "Visuals Service",
+  "options" : {
+    "instance_sharing" : "shared_instance_across_users"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -18,7 +21,6 @@
       "requires": {
         "*": [ "app" ],
         "catalog": [ "directory" ],
-        "service_manager": [ "service_manager:all_users" ],
         "ui": [ "ozone" ]
       }
     }

services/ws/manifest.json

@@ -2,6 +2,9 @@
   "name": "ui",
   "sandbox_type": "none",
   "display_name": "UI Service",
+  "options" : {
+    "instance_sharing" : "singleton"
+  },
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
@@ -59,7 +62,6 @@
       "requires": {
         "*": [ "app" ],
         "catalog": [ "directory" ],
-        "service_manager": [ "service_manager:singleton" ],
         "ui": [ "ozone" ],
         "viz": [ "viz_host" ]
       }