Reland: Build Mojo apps in sub-dirs, like application packages.

mojo/runner/context.cc

 // Copyright 2013 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/runner/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 58 matching lines @@
     base_url = context->ResolveShellFileURL("");
 
   if (!base_url.is_valid())
     return false;
 
   resolver->SetMojoBaseURL(base_url);
 
   // The network service must be loaded from the filesystem.
   // This mapping is done before the command line URL mapping are processed, so
   // that it can be overridden.
-  resolver->AddURLMapping(
-      GURL("mojo:network_service"),
-      context->ResolveShellFileURL("file:network_service.mojo"));
+  resolver->AddURLMapping(GURL("mojo:network_service"),
+                          context->ResolveShellFileURL(
+                              "file:network_service/network_service.mojo"));
 
   // Command line URL mapping.
   std::vector<URLResolver::OriginMapping> origin_mappings =
       URLResolver::GetOriginMappings(command_line.argv());
   for (const auto& origin_mapping : origin_mappings)
     resolver->AddOriginMapping(GURL(origin_mapping.origin),
                                GURL(origin_mapping.base_url));
 
   if (command_line.HasSwitch(switches::kURLMappings)) {
     const std::string mappings =
@@ skipping 282 matching lines @@
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK_EQ(base::MessageLoop::current()->task_runner(),
                 task_runners_->shell_runner());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo