Move package_manager into mojo/shell

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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 13 matching lines @@
 #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 "components/devtools_service/public/cpp/switches.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/tracing/tracing_switches.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/package_manager/package_manager_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/host/in_process_native_runner.h"
 #include "mojo/runner/host/out_of_process_native_runner.h"
 #include "mojo/runner/register_local_aliases.h"
 #include "mojo/runner/switches.h"
 #include "mojo/runner/tracer.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
+#include "mojo/shell/package_manager/package_manager_impl.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace runner {
 namespace {
 
 // Used to ensure we only init once.
 class Setup {
  public:
   Setup() {
     embedder::PreInitializeParentProcess();
     embedder::Init();
   }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
-void InitContentHandlers(package_manager::PackageManagerImpl* manager,
+void InitContentHandlers(shell::PackageManagerImpl* manager,
                          const base::CommandLine& command_line) {
   // Default content handlers.
   manager->RegisterContentHandler("application/javascript",
                                   GURL("mojo:html_viewer"));
   manager->RegisterContentHandler("application/pdf", GURL("mojo:pdf_viewer"));
   manager->RegisterContentHandler("image/gif", GURL("mojo:html_viewer"));
   manager->RegisterContentHandler("image/jpeg", GURL("mojo:html_viewer"));
   manager->RegisterContentHandler("image/png", GURL("mojo:html_viewer"));
   manager->RegisterContentHandler("text/css", GURL("mojo:html_viewer"));
   manager->RegisterContentHandler("text/html", GURL("mojo:html_viewer"));
@@ skipping 128 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, this,
                            task_runners_->io_runner(),
                            embedder::ScopedPlatformHandle());
 
-  package_manager_ = new package_manager::PackageManagerImpl(
+  package_manager_ = new shell::PackageManagerImpl(
       shell_file_root, task_runners_->blocking_pool());
   InitContentHandlers(package_manager_, command_line);
 
   RegisterLocalAliases(package_manager_);
 
   scoped_ptr<shell::NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kEnableMultiprocess)) {
     runner_factory.reset(
         new OutOfProcessNativeRunnerFactory(task_runners_->blocking_pool()));
   } else {
@@ skipping 116 matching lines @@
         base::MessageLoop::current()->QuitWhenIdle();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo