Revert of Move fetching logic out of ApplicationManager, eliminate url mappings.

mojo/runner/context.h

 // 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.
 
 #ifndef MOJO_RUNNER_CONTEXT_H_
 #define MOJO_RUNNER_CONTEXT_H_
 
-#include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/runner/scoped_user_data_dir.h"
 #include "mojo/runner/task_runners.h"
+#include "mojo/runner/url_resolver.h"
 #include "mojo/shell/application_manager.h"
-#include "url/gurl.h"
 
 namespace mojo {
 namespace runner {
 
 class NativeApplicationLoader;
 
 // The "global" context for the shell's main process.
-class Context : public embedder::ProcessDelegate {
+class Context : public shell::ApplicationManager::Delegate,
+                public embedder::ProcessDelegate {
  public:
-  explicit Context(const base::FilePath& shell_file_root);
+  Context();
   ~Context() override;
 
   static void EnsureEmbedderIsInitialized();
 
+  // Point to the directory containing installed services, such as the network
+  // service. By default this directory is used as the base URL for resolving
+  // unknown mojo: URLs. The network service will be loaded from this directory,
+  // even when the base URL for unknown mojo: URLs is overridden.
+  void SetShellFileRoot(const base::FilePath& path);
+
+  // Resolve an URL relative to the shell file root. This is a nop for
+  // everything but relative file URLs or URLs without a scheme.
+  GURL ResolveShellFileURL(const std::string& path);
+
+  // Override the CWD, which is used for resolving file URLs passed in from the
+  // command line.
+  void SetCommandLineCWD(const base::FilePath& path);
+
+  // Resolve an URL relative to the CWD mojo_shell was invoked from. This is a
+  // nop for everything but relative file URLs or URLs without a scheme.
+  GURL ResolveCommandLineURL(const std::string& path);
+
   // This must be called with a message loop set up for the current thread,
   // which must remain alive until after Shutdown() is called. Returns true on
   // success.
   bool Init();
 
   // If Init() was called and succeeded, this must be called before destruction.
   void Shutdown();
 
   // NOTE: call either Run() or RunCommandLineApplication(), but not both.
 
   // Runs the app specified by |url|.
   void Run(const GURL& url);
 
   // Run the application specified on the commandline. When the app finishes,
   // |callback| is run if not null, otherwise the message loop is quit.
   void RunCommandLineApplication(const base::Closure& callback);
 
   TaskRunners* task_runners() { return task_runners_.get(); }
   shell::ApplicationManager* application_manager() {
-    return application_manager_.get();
+    return &application_manager_;
   }
+  URLResolver* url_resolver() { return &url_resolver_; }
 
  private:
   class NativeViewportApplicationLoader;
 
+  // ApplicationManager::Delegate overrides.
+  GURL ResolveMappings(const GURL& url) override;
+  GURL ResolveMojoURL(const GURL& url) override;
+  bool CreateFetcher(
+      const GURL& url,
+      const shell::Fetcher::FetchCallback& loader_callback) override;
+
   // ProcessDelegate implementation.
   void OnShutdownComplete() override;
 
   void OnApplicationEnd(const GURL& url);
 
   ScopedUserDataDir scoped_user_data_dir;
   std::set<GURL> app_urls_;
   scoped_ptr<TaskRunners> task_runners_;
-  scoped_ptr<shell::ApplicationManager> application_manager_;
+  shell::ApplicationManager application_manager_;
+  URLResolver url_resolver_;
+  GURL shell_file_root_;
+  GURL command_line_cwd_;
   base::Closure app_complete_callback_;
   base::Time main_entry_time_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace runner
 }  // namespace mojo
 
 #endif  // MOJO_RUNNER_CONTEXT_H_