Move fetching logic out of ApplicationManager, eliminate url mappings.

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 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 "content/browser/mojo/mojo_shell_context.h"
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/process_control.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/common/url_type_converters.h"
+#include "mojo/fetcher/base_application_fetcher.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/static_application_loader.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 #include "media/mojo/services/mojo_media_application.h"
 #endif
@@ skipping 115 matching lines @@
 
 // static
 base::LazyInstance<scoped_ptr<MojoShellContext::Proxy>>
     MojoShellContext::proxy_ = LAZY_INSTANCE_INITIALIZER;
 
 void MojoShellContext::SetApplicationsForTest(
     const StaticApplicationMap* apps) {
   g_applications_for_test = apps;
 }
 
-MojoShellContext::MojoShellContext()
-    : application_manager_(new mojo::shell::ApplicationManager(this)) {
+MojoShellContext::MojoShellContext() {
   proxy_.Get().reset(new Proxy(this));
 
+  // Construct with an empty filepath since mojo: urls can't be registered now
+  // the url scheme registry is locked.
+  scoped_ptr<mojo::fetcher::BaseApplicationFetcher> fetcher(
+      new mojo::fetcher::BaseApplicationFetcher(base::FilePath()));
+  application_manager_.reset(
+      new mojo::shell::ApplicationManager(fetcher.Pass()));
+
   application_manager_->set_default_loader(
       scoped_ptr<mojo::shell::ApplicationLoader>(new DefaultApplicationLoader));
 
   StaticApplicationMap apps;
   GetContentClient()->browser()->RegisterInProcessMojoApplications(&apps);
   if (g_applications_for_test) {
     // Add testing apps to the map, potentially overwriting whatever the
     // browser client registered.
     for (const auto& entry : *g_applications_for_test)
       apps[entry.first] = entry.second;
@@ skipping 64 matching lines @@
   params->set_originator_filter(mojo::shell::GetPermissiveCapabilityFilter());
   params->SetURLInfo(url);
   params->set_services(request.Pass());
   params->set_exposed_services(exposed_services.Pass());
   params->set_filter(filter);
   params->set_on_application_end(base::Bind(&base::DoNothing));
   params->set_connect_callback(callback);
   application_manager_->ConnectToApplication(params.Pass());
 }
 
-GURL MojoShellContext::ResolveMappings(const GURL& url) {
-  return url;
-}
-
-GURL MojoShellContext::ResolveMojoURL(const GURL& url) {
-  return url;
-}
-
-bool MojoShellContext::CreateFetcher(
-    const GURL& url,
-    const mojo::shell::Fetcher::FetchCallback& loader_callback) {
-  return false;
-}
-
 }  // namespace content