Remove blanket module directory access from catalog service

Several services require "app" capability from all other services
(wildcard), which is in itself probably a Bad Thing; but it's
especially bad now because the catalog service exposes module
directory access through its app capability.

This changes the catalog manifest to move the capability to a
different more specific capability, and updates two of its
consumers.

May break other random mash/mushrome (i.e. non-production) services
depend on the blanket directory access behavior since aura mus
client library code depends on it in some environments.

Bug: 791003
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I81d81af8385fb1e013445a6b8c175ebf96388077
Reviewed-on: https://chromium-review.googlesource.com/804397
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521115}

ash/manifest.json

@@ -45,6 +45,7 @@
       "requires": {
         "*": [ "accessibility", "app" ],
         "ash_pref_connector": [ "pref_connector" ],
+        "catalog": [ "directory" ],
         "local_state": [ "pref_client" ],
         "ui": [ "display_dev", "window_manager", "video_detector" ],
         "touch_hud": [ "mash:launchable" ]

mash/quick_launch/manifest.json

@@ -7,7 +7,10 @@
       "provides": { "mash:launchable": [ "mash::mojom::Launchable" ] },
       "requires": {
         "*": [ "app", "mash:launchable" ],
-        "catalog": [ "catalog:catalog" ]
+        "catalog": [
+          "catalog:catalog",
+          "directory"
+        ]
       }
     }
   }

services/catalog/manifest.json

@@ -9,7 +9,7 @@
     // build time or something. Same with service:service_manager.
     "service_manager:connector": {
       "provides": {
-        "app": [ "filesystem::mojom::Directory" ],
+        "directory": [ "filesystem::mojom::Directory" ],
         "control": [ "catalog::mojom::CatalogControl" ]
       },
       "requires": {

services/service_manager/service_manager.cc

@@ -1050,7 +1050,7 @@ void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
   // TODO(beng): It'd be great to build this from the manifest, however there's
   //             a bit of a chicken-and-egg problem.
   InterfaceProviderSpec spec;
-  spec.provides["app"].insert("filesystem::mojom::Directory");
+  spec.provides["directory"].insert("filesystem::mojom::Directory");
   spec.provides["catalog:catalog"].insert("catalog::mojom::Catalog");
   spec.provides["control"].insert("catalog::mojom::CatalogControl");
   InterfaceProviderSpecMap specs;

services/ui/manifest.json

@@ -79,7 +79,7 @@
       },
       "requires": {
         "*": [ "app" ],
-        "catalog": [ "app" ],
+        "catalog": [ "directory" ],
         "service_manager": [ "service_manager:all_users" ],
         "ui": [ "ozone" ],
         "viz": [ "viz_host" ]

services/viz/manifest.json

@@ -17,7 +17,7 @@
       },
       "requires": {
         "*": [ "app" ],
-        "catalog": [ "app" ],
+        "catalog": [ "directory" ],
         "service_manager": [ "service_manager:all_users" ],
         "ui": [ "ozone" ]
       }