Adds support for mojo apps to live in their own directory

mojo/shell/url_resolver.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 "mojo/shell/url_resolver.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/shell/application_manager/query_util.h"
 #include "mojo/shell/filename_util.h"
 #include "mojo/shell/switches.h"
 #include "url/url_util.h"
 
 namespace mojo {
 namespace shell {
 
@@ skipping 79 matching lines @@
   DCHECK(mojo_base_url.is_valid());
   // Force a trailing slash on the base_url to simplify resolving
   // relative files and URLs below.
   mojo_base_url_ = AddTrailingSlashIfNeeded(mojo_base_url);
 }
 
 GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
   if (mojo_url.scheme() != "mojo") {
     // The mapping has produced some sort of non-mojo: URL - file:, http:, etc.
     return mojo_url;
-  } else {
-    // It's still a mojo: URL, use the default mapping scheme.
-    std::string query;
-    GURL base_url = GetBaseURLAndQuery(mojo_url, &query);
-    std::string lib = base_url.host() + ".mojo" + query;
-    return mojo_base_url_.Resolve(lib);
   }
+
+  // It's still a mojo: URL, use the default mapping scheme.
+  std::string query;
+  GURL base_url = GetBaseURLAndQuery(mojo_url, &query);
+  if (mojo_base_url_.SchemeIsFile()) {
+    const GURL url_with_directory(
+        mojo_base_url_.Resolve(base_url.host() + "/"));
+    const base::FilePath file_path(UrlToFilePath(url_with_directory));
+    if (base::DirectoryExists(file_path))
+      return url_with_directory.Resolve(base_url.host() + ".mojo" + query);
+  }
+  return mojo_base_url_.Resolve(base_url.host() + ".mojo" + query);
 }
 
 }  // namespace shell
 }  // namespace mojo