Fix manifest loading for catalog and shell.

services/catalog/reader.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/reader.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 89 matching lines @@
     base::FilePath manifest_path = path.AppendASCII("manifest.json");
     std::unique_ptr<Entry> entry =
         CreateEntryForManifestAt(manifest_path, package_dir);
     if (!entry)
       continue;
 
     // Skip over subdirs that contain only manifests, they're artifacts of the
     // build (e.g. for applications that are packaged into others) and are not
     // valid standalone packages.
     base::FilePath package_path = GetPackagePath(package_dir, entry->name());
-    if (!base::PathExists(package_path))
+    if (entry->name() != "mojo:shell" && entry->name() != "mojo:catalog" &&
+        !base::PathExists(package_path)) {
       continue;
+    }
 
     original_thread_task_runner->PostTask(
         FROM_HERE,
         base::Bind(read_manifest_callback, base::Passed(&entry)));
   }
 
   original_thread_task_runner->PostTask(FROM_HERE, read_complete_closure);
 }
 
 std::unique_ptr<Entry> ReadManifest(const base::FilePath& package_dir,
@@ skipping 83 matching lines @@
     EntryCache* cache,
     const CreateEntryForNameCallback& entry_created_callback,
     std::unique_ptr<Entry> entry) {
   shell::mojom::ResolveResultPtr result =
       shell::mojom::ResolveResult::From(*entry);
   AddEntryToCache(cache, std::move(entry));
   entry_created_callback.Run(std::move(result));
 }
 
 }  // namespace catalog