Move package_manager into mojo/shell

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/runner/scoped_user_data_dir.h"
 #include "mojo/runner/task_runners.h"
 #include "mojo/runner/tracer.h"
 #include "mojo/shell/application_manager.h"
 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 #include "url/gurl.h"
 
 namespace mojo {
-namespace package_manager {
+namespace shell {
 class PackageManagerImpl;
 }
 namespace runner {
 
 class NativeApplicationLoader;
 
 // The "global" context for the shell's main process.
 // TODO(use_chrome_edk)
 //class Context : public edk::ProcessDelegate {
 class Context : public embedder::ProcessDelegate {
@@ skipping 18 matching lines @@
 
   // 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();
   }
 
-  package_manager::PackageManagerImpl* package_manager() {
-    return package_manager_;
-  }
+  shell::PackageManagerImpl* package_manager() { return package_manager_; }
 
  private:
   class NativeViewportApplicationLoader;
 
   // 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_;
   // Ensure this is destructed before task_runners_ since it owns a message pipe
   // that needs the IO thread to destruct cleanly.
   Tracer tracer_;
   // Owned by |application_manager_|.
-  package_manager::PackageManagerImpl* package_manager_;
+  shell::PackageManagerImpl* package_manager_;
   scoped_ptr<shell::ApplicationManager> application_manager_;
   base::Closure app_complete_callback_;
   base::Time main_entry_time_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace runner
 }  // namespace mojo
 
 #endif  // MOJO_RUNNER_CONTEXT_H_