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

mojo/shell/application_manager.cc

Index: mojo/shell/application_manager.cc
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index f41939d28e8809c0a421c2e7cb1fc4ab8daaad6e..0ef4345b49d5e8bb23e9498f17a052cd6971c012 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -13,12 +13,14 @@
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/shell/application_fetcher.h"
 #include "mojo/shell/application_instance.h"
 #include "mojo/shell/content_handler_connection.h"
 #include "mojo/shell/fetcher.h"
+#include "mojo/shell/local_fetcher.h"
+#include "mojo/shell/network_fetcher.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
+#include "mojo/shell/update_fetcher.h"
 
 namespace mojo {
 namespace shell {
@@ -50,12 +52,11 @@
          manager_->identity_to_instance_.end();
 }
 
-ApplicationManager::ApplicationManager(scoped_ptr<ApplicationFetcher> fetcher)
-    : fetcher_(fetcher.Pass()),
+ApplicationManager::ApplicationManager(Delegate* delegate)
+    : delegate_(delegate),
+      disable_cache_(false),
       content_handler_id_counter_(0u),
-      weak_ptr_factory_(this) {
-  fetcher_->SetApplicationManager(this);
-}
+      weak_ptr_factory_(this) {}
 
 ApplicationManager::~ApplicationManager() {
   URLToContentHandlerMap url_to_content_handler(url_to_content_handler_);
@@ -103,7 +104,15 @@
   DCHECK(original_url.is_valid());
   DCHECK(original_url_request);
 
-  GURL resolved_url = fetcher_->ResolveURL(original_url);
+  // We check both the mapped and resolved urls for existing instances because
+  // external applications can be registered for the unresolved mojo:foo urls.
+
+  GURL mapped_url = delegate_->ResolveMappings(original_url);
+  params->SetURLInfo(mapped_url);
+  if (ConnectToRunningApplication(&params))
+    return;
+
+  GURL resolved_url = delegate_->ResolveMojoURL(mapped_url);
   params->SetURLInfo(resolved_url);
   if (ConnectToRunningApplication(&params))
     return;
@@ -112,9 +121,18 @@
   // NOTE: Set URL info using |original_url_request| instead of |original_url|
   // because it may contain more information (e.g., it is a POST request).
   params->SetURLInfo(original_url_request.Pass());
-  ApplicationLoader* loader = GetLoaderForURL(resolved_url);
-  if (loader) {
-    ConnectToApplicationWithLoader(&params, resolved_url, loader);
+  if (ConnectToApplicationWithLoader(&params, mapped_url,
+                                     GetLoaderForURL(mapped_url))) {
+    return;
+  }
+
+  if (ConnectToApplicationWithLoader(&params, resolved_url,
+                                     GetLoaderForURL(resolved_url))) {
+    return;
+  }
+
+  if (ConnectToApplicationWithLoader(&params, resolved_url,
+                                     default_loader_.get())) {
     return;
   }
 
@@ -122,7 +140,56 @@
   auto callback =
       base::Bind(&ApplicationManager::HandleFetchCallback,
                  weak_ptr_factory_.GetWeakPtr(), base::Passed(&params));
-  fetcher_->FetchRequest(original_url_request.Pass(), callback);
+
+  if (delegate_->CreateFetcher(
+          resolved_url,
+          base::Bind(callback, NativeApplicationCleanup::DONT_DELETE))) {
+    return;
+  }
+
+  if (resolved_url.SchemeIsFile()) {
+    // LocalFetcher uses the network service to infer MIME types from URLs.
+    // Skip this for mojo URLs to avoid recursively loading the network service.
+    if (!network_service_ && !original_url.SchemeIs("mojo"))
+      ConnectToService(GURL("mojo:network_service"), &network_service_);
+    new LocalFetcher(
+        network_service_.get(), resolved_url,
+        GetBaseURLAndQuery(resolved_url, nullptr),
+        base::Bind(callback, NativeApplicationCleanup::DONT_DELETE));
+    return;
+  }
+
+  if (mapped_url.SchemeIs("mojo") &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseUpdater)) {
+    ConnectToService(GURL("mojo:updater"), &updater_);
+    new UpdateFetcher(
+        mapped_url, updater_.get(),
+        base::Bind(callback, NativeApplicationCleanup::DONT_DELETE));
+    return;
+  }
+
+  if (!url_loader_factory_)
+    ConnectToService(GURL("mojo:network_service"), &url_loader_factory_);
+
+  const NativeApplicationCleanup cleanup =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDontDeleteOnDownload)
+          ? NativeApplicationCleanup::DONT_DELETE
+          : NativeApplicationCleanup::DELETE;
+
+  if (original_url.SchemeIs("mojo")) {
+    // Use the resolved mojo URL in the request to support origin mapping, etc.
+    URLRequestPtr resolved_url_request(URLRequest::New());
+    resolved_url_request->url = resolved_url.spec();
+    new NetworkFetcher(disable_cache_, resolved_url_request.Pass(),
+                       url_loader_factory_.get(),
+                       base::Bind(callback, cleanup));
+    return;
+  }
+
+  new NetworkFetcher(disable_cache_, original_url_request.Pass(),
+                     url_loader_factory_.get(), base::Bind(callback, cleanup));
 }
 
 bool ApplicationManager::ConnectToRunningApplication(
@@ -136,14 +203,18 @@
   return true;
 }
 
-void ApplicationManager::ConnectToApplicationWithLoader(
+bool ApplicationManager::ConnectToApplicationWithLoader(
     scoped_ptr<ConnectToApplicationParams>* params,
     const GURL& resolved_url,
     ApplicationLoader* loader) {
+  if (!loader)
+    return false;
+
   if (!(*params)->app_url().SchemeIs("mojo"))
     (*params)->SetURLInfo(resolved_url);
 
   loader->Load(resolved_url, RegisterInstance(params->Pass(), nullptr));
+  return true;
 }
 
 InterfaceRequest<Application> ApplicationManager::RegisterInstance(
@@ -177,6 +248,7 @@
 
 void ApplicationManager::HandleFetchCallback(
     scoped_ptr<ConnectToApplicationParams> params,
+    NativeApplicationCleanup cleanup,
     scoped_ptr<Fetcher> fetcher) {
   if (!fetcher) {
     // Network error. Drop |params| to tell the requestor.
@@ -228,8 +300,6 @@
   // If the response begins with a #!mojo <content-handler-url>, use it.
   GURL content_handler_url;
   std::string shebang;
-  // TODO(beng): it seems like some delegate should/would want to have a say in
-  //             configuring the qualifier also.
   bool enable_multi_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableMultiprocess);
 
@@ -315,13 +385,14 @@
                   base::Bind(&ApplicationManager::RunNativeApplication,
                              weak_ptr_factory_.GetWeakPtr(),
                              base::Passed(request.Pass()), start_sandboxed,
-                             options, base::Passed(fetcher.Pass())));
+                             options, cleanup, base::Passed(fetcher.Pass())));
 }
 
 void ApplicationManager::RunNativeApplication(
     InterfaceRequest<Application> application_request,
     bool start_sandboxed,
     const NativeRunnerFactory::Options& options,
+    NativeApplicationCleanup cleanup,
     scoped_ptr<Fetcher> fetcher,
     const base::FilePath& path,
     bool path_exists) {
@@ -340,8 +411,7 @@
                path.AsUTF8Unsafe());
   NativeRunner* runner = native_runner_factory_->Create(options).release();
   native_runners_.push_back(runner);
-  runner->Start(path, start_sandboxed, NativeApplicationCleanup::DONT_DELETE,
-                application_request.Pass(),
+  runner->Start(path, start_sandboxed, cleanup, application_request.Pass(),
                 base::Bind(&ApplicationManager::CleanupRunner,
                            weak_ptr_factory_.GetWeakPtr(), runner));
 }
@@ -414,7 +484,8 @@
     const GURL& url) {
   DCHECK(!url.has_query());  // Precondition.
   // Apply mappings and resolution to get the resolved URL.
-  GURL resolved_url = fetcher_->ResolveURL(url);
+  GURL resolved_url =
+      delegate_->ResolveMojoURL(delegate_->ResolveMappings(url));
   DCHECK(!resolved_url.has_query());  // Still shouldn't have query.
   // TODO(vtl): We should probably also remove/disregard the query string (and
   // maybe canonicalize in other ways).
@@ -430,7 +501,7 @@
   auto scheme_it = scheme_to_loader_.find(url.scheme());
   if (scheme_it != scheme_to_loader_.end())
     return scheme_it->second;
-  return default_loader_.get();
+  return nullptr;
 }
 
 void ApplicationManager::OnApplicationInstanceError(