Create .mojo applications in a common subdir under out/Debug

mojo/services/catalog/catalog.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 "mojo/services/catalog/catalog.h"
 
 #include "base/bind.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/strings/string_split.h"
 #include "base/task_runner_util.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/services/catalog/entry.h"
 #include "mojo/services/catalog/store.h"
 #include "mojo/shell/public/cpp/names.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 namespace catalog {
 namespace {
 
 base::FilePath GetManifestPath(const base::FilePath& package_dir,
                                const std::string& name) {
   // TODO(beng): think more about how this should be done for exe targets.
   std::string type = mojo::GetNameType(name);
   std::string path = mojo::GetNamePath(name);
-  if (type == mojo::kNameType_Mojo)
-    return package_dir.AppendASCII(path + "/manifest.json");
+  if (type == mojo::kNameType_Mojo) {
+    return package_dir.AppendASCII("Mojo Applications").AppendASCII(
+        path + "/manifest.json");
+  }
   if (type == mojo::kNameType_Exe)
     return package_dir.AppendASCII(path + "_manifest.json");
   return base::FilePath();
 }
 
 base::FilePath GetPackagePath(const base::FilePath& package_dir,
                               const std::string& name) {
   std::string type = mojo::GetNameType(name);
   if (type == mojo::kNameType_Mojo) {
     // It's still a mojo: URL, use the default mapping scheme.
     const std::string host = mojo::GetNamePath(name);
-    return package_dir.AppendASCII(host + "/" + host + ".mojo");
+    return package_dir.AppendASCII("Mojo Applications").AppendASCII(
+        host + "/" + host + ".mojo");
   }
   if (type == mojo::kNameType_Exe) {
 #if defined OS_WIN
     std::string extension = ".exe";
 #else
     std::string extension;
 #endif
     return package_dir.AppendASCII(mojo::GetNamePath(name) + extension);
   }
   return base::FilePath();
@@ skipping 181 matching lines @@
   EntryCache* catalog = is_system_catalog ? system_catalog_ : &user_catalog_;
   if (catalog->end() != catalog->find(entry->name()))
     return;
   for (auto child : entry->applications())
     AddEntryToCatalog(make_scoped_ptr(child), is_system_catalog);
   (*catalog)[entry->name()] = std::move(entry);
   SerializeCatalog();
 }
 
 }  // namespace catalog