Eliminate mojo:resource_provider

services/shell/shell.cc

 // Copyright 2014 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 "services/shell/shell.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 22 matching lines @@
 namespace {
 
 const char kCatalogName[] = "mojo:catalog";
 const char kShellName[] = "mojo:shell";
 const char kCapabilityClass_UserID[] = "shell:user_id";
 const char kCapabilityClass_ClientProcess[] = "shell:client_process";
 const char kCapabilityClass_InstanceName[] = "shell:instance_name";
 const char kCapabilityClass_AllUsers[] = "shell:all_users";
 const char kCapabilityClass_ExplicitClass[] = "shell:explicit_class";
 
-void EmptyResolverCallback(mojom::ResolveResultPtr result) {}
-
 }  // namespace
 
 Identity CreateShellIdentity() {
   return Identity(kShellName, mojom::kRootUserID);
 }
 
 Identity CreateCatalogIdentity() {
   return Identity(kCatalogName, mojom::kRootUserID);
 }
 
@@ skipping 469 matching lines @@
     }
   }
   DCHECK(instance);
   return instance->AcceptConnection(connection);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 void Shell::InitCatalog(mojom::ShellClientPtr catalog) {
+  // TODO(beng): It'd be great to build this from the manifest, however there's
+  //             a bit of a chicken-and-egg problem.
+  CapabilitySpec spec;
+  Interfaces interfaces;
+  interfaces.insert("filesystem::Directory");
+  spec.provided["app"] = interfaces;
   Instance* instance = CreateInstance(CreateShellIdentity(),
                                       CreateCatalogIdentity(),
-                                      CapabilitySpec());
+                                      spec);
   singletons_.insert(kCatalogName);
   instance->StartWithClient(std::move(catalog));
-
-  // TODO(beng): this doesn't work anymore.
-  // Seed the catalog with manifest info for the shell & catalog.
-  mojom::ShellResolverPtr resolver;
-  shell_connection_->connector()->ConnectToInterface(kCatalogName, &resolver);
-  resolver->ResolveMojoName(kCatalogName, base::Bind(&EmptyResolverCallback));
-  resolver->ResolveMojoName(kShellName, base::Bind(&EmptyResolverCallback));
 }
 
 mojom::ShellResolver* Shell::GetResolver(const Identity& identity) {
   auto iter = identity_to_resolver_.find(identity);
   if (iter != identity_to_resolver_.end())
     return iter->second.get();
 
   mojom::ShellResolverPtr resolver_ptr;
   ConnectToInterface(this, identity, CreateCatalogIdentity(), &resolver_ptr);
   mojom::ShellResolver* resolver = resolver_ptr.get();
@@ skipping 224 matching lines @@
 void Shell::CleanupRunner(NativeRunner* runner) {
   for (auto it = native_runners_.begin(); it != native_runners_.end(); ++it) {
     if (it->get() == runner) {
       native_runners_.erase(it);
       return;
     }
   }
 }
 
 }  // namespace shell