Make "all user" services work when packaged.

services/catalog/entry.cc

 // 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.
 
 #include "services/catalog/entry.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "services/catalog/store.h"
 #include "services/service_manager/public/cpp/names.h"
@@ skipping 241 matching lines @@
 service_manager::mojom::ResolveResultPtr
 TypeConverter<service_manager::mojom::ResolveResultPtr,
               catalog::Entry>::Convert(const catalog::Entry& input) {
   service_manager::mojom::ResolveResultPtr result(
       service_manager::mojom::ResolveResult::New());
   result->name = input.name();
   const catalog::Entry& package = input.package() ? *input.package() : input;
   result->resolved_name = package.name();
   result->qualifier = input.qualifier();
   result->interface_provider_specs = input.interface_provider_specs();
+  if (input.package()) {
+    auto it = package.interface_provider_specs().find(
+        service_manager::mojom::kServiceManager_ConnectorSpec);
+    if (it != package.interface_provider_specs().end())
+      result->package_spec = it->second;
+  }
   result->package_path = package.path();
   return result;
 }
 
 // static
 catalog::mojom::EntryPtr
     TypeConverter<catalog::mojom::EntryPtr, catalog::Entry>::Convert(
         const catalog::Entry& input) {
   catalog::mojom::EntryPtr result(catalog::mojom::Entry::New());
   result->name = input.name();
   result->display_name = input.display_name();
   return result;
 }
 
 }  // namespace mojo