Adds support for mojo apps to live in their own directory

mojo/util/filename_util.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/runner/filename_util.h"
+#include "mojo/util/filename_util.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "url/gurl.h"
 #include "url/url_canon_internal.h"
 #include "url/url_util.h"
 
 namespace mojo {
-namespace shell {
+namespace util {
 
 // Prefix to prepend to get a file URL.
 static const base::FilePath::CharType kFileURLPrefix[] =
     FILE_PATH_LITERAL("file://");
 
 GURL FilePathToFileURL(const base::FilePath& path) {
   // Produce a URL like "file:///C:/foo" for a regular file, or
   // "file://///server/path" for UNC. The URL canonicalizer will fix up the
   // latter case to be the canonical UNC form: "file://server/path"
   base::FilePath::StringType url_string(kFileURLPrefix);
@@ skipping 35 matching lines @@
 GURL AddTrailingSlashIfNeeded(const GURL& url) {
   if (!url.has_path() || *url.path().rbegin() == '/')
     return url;
 
   std::string path(url.path() + '/');
   GURL::Replacements replacements;
   replacements.SetPathStr(path);
   return url.ReplaceComponents(replacements);
 }
 
-}  // namespace shell
+base::FilePath UrlToFilePath(const GURL& url) {
+  DCHECK(url.SchemeIsFile());
+  url::RawCanonOutputW<1024> output;
+  url::DecodeURLEscapeSequences(url.path().data(),
+                                static_cast<int>(url.path().length()), &output);
+  base::string16 decoded_path = base::string16(output.data(), output.length());
+#if defined(OS_WIN)
+  base::TrimString(decoded_path, L"/", &decoded_path);
+  base::FilePath path(decoded_path);
+#else
+  base::FilePath path(base::UTF16ToUTF8(decoded_path));
+#endif
+  return path;
+}
+
+}  // namespace util
 }  // namespace mojo