Adds support for mojo apps to live in their own directory

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"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "mojo/common/trace_controller_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/runner/filename_util.h"
 #include "mojo/runner/in_process_native_runner.h"
 #include "mojo/runner/out_of_process_native_runner.h"
 #include "mojo/runner/switches.h"
 #include "mojo/services/tracing/tracing.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
 // Used to ensure we only init once.
 class Setup {
  public:
   Setup() {
@@ skipping 164 matching lines @@
   DCHECK(!base::MessageLoop::current());
 }
 
 // static
 void Context::EnsureEmbedderIsInitialized() {
   static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
   setup.Get();
 }
 
 void Context::SetShellFileRoot(const base::FilePath& path) {
-  shell_file_root_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
+  shell_file_root_ =
+      util::AddTrailingSlashIfNeeded(util::FilePathToFileURL(path));
 }
 
 GURL Context::ResolveShellFileURL(const std::string& path) {
   return shell_file_root_.Resolve(path);
 }
 
 void Context::SetCommandLineCWD(const base::FilePath& path) {
-  command_line_cwd_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
+  command_line_cwd_ =
+      util::AddTrailingSlashIfNeeded(util::FilePathToFileURL(path));
 }
 
 GURL Context::ResolveCommandLineURL(const std::string& path) {
   return command_line_cwd_.Resolve(path);
 }
 
 bool Context::Init() {
   TRACE_EVENT0("mojo_shell", "Context::Init");
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
@@ skipping 76 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 shell
 }  // namespace mojo