Move more of ContentHandler handling into PackageManager.

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"
@@ skipping 173 matching lines @@
 
   EnsureEmbedderIsInitialized();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->task_runner()));
 
   // TODO(vtl): This should be MASTER, not NONE.
   embedder::InitIPCSupport(
       embedder::ProcessType::NONE, task_runners_->shell_runner(), this,
       task_runners_->io_runner(), embedder::ScopedPlatformHandle());
 
-  package_manager_ = new package_manager::PackageManagerImpl(shell_file_root_);
+  package_manager_ = new package_manager::PackageManagerImpl(
+      shell_file_root_, task_runners_->blocking_pool());
   InitContentHandlers(package_manager_, command_line);
 
-  application_manager_.reset(
-      new shell::ApplicationManager(make_scoped_ptr(package_manager_)));
-
   scoped_ptr<shell::NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessNativeRunnerFactory(this));
   else
     runner_factory.reset(new InProcessNativeRunnerFactory(this));
-  application_manager_->set_blocking_pool(task_runners_->blocking_pool());
-  application_manager_->set_native_runner_factory(runner_factory.Pass());
+  application_manager_.reset(new shell::ApplicationManager(
+      make_scoped_ptr(package_manager_), runner_factory.Pass(),
+      task_runners_->blocking_pool()));
 
   ServiceProviderPtr service_provider_ptr;
   ServiceProviderPtr tracing_service_provider_ptr;
   new TracingServiceProvider(GetProxy(&tracing_service_provider_ptr));
 
   scoped_ptr<shell::ConnectToApplicationParams> params(
       new shell::ConnectToApplicationParams);
   params->set_source(shell::Identity(GURL("mojo:shell"), std::string(),
                                      shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(shell::Identity(GURL("mojo:tracing"), std::string(),
@@ skipping 85 matching lines @@
         base::MessageLoop::current()->Quit();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo