Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/context.cc

Index: mojo/shell/standalone/context.cc
diff --git a/mojo/runner/context.cc b/mojo/shell/standalone/context.cc
similarity index 86%
rename from mojo/runner/context.cc
rename to mojo/shell/standalone/context.cc
index c7b8c9a80fdbee107e12ec5b4a9b1ca288ffa39c..22e94144d76f6159b9bbc9a5934c157be92658ff 100644
--- a/mojo/runner/context.cc
+++ b/mojo/shell/standalone/context.cc
@@ -2,7 +2,7 @@
 // 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 "mojo/shell/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -29,9 +29,6 @@
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/tracing/tracing_switches.h"
 #include "mojo/public/cpp/bindings/strong_binding.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"
@@ -45,13 +42,16 @@
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/runner/host/in_process_native_runner.h"
 #include "mojo/shell/runner/host/out_of_process_native_runner.h"
+#include "mojo/shell/standalone/register_local_aliases.h"
+#include "mojo/shell/standalone/switches.h"
+#include "mojo/shell/standalone/tracer.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 shell {
 namespace {
 
 // Used to ensure we only init once.
@@ -68,7 +68,7 @@ class Setup {
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
-void InitContentHandlers(shell::PackageManagerImpl* manager,
+void InitContentHandlers(PackageManagerImpl* manager,
                          const base::CommandLine& command_line) {
   // Default content handlers.
   manager->RegisterContentHandler("application/javascript",
@@ -121,7 +121,7 @@ void InitContentHandlers(shell::PackageManagerImpl* manager,
   }
 }
 
-void InitDevToolsServiceIfNeeded(shell::ApplicationManager* manager,
+void InitDevToolsServiceIfNeeded(ApplicationManager* manager,
                                  const base::CommandLine& command_line) {
   if (!command_line.HasSwitch(devtools_service::kRemoteDebuggingPort))
     return;
@@ -137,13 +137,11 @@ void InitDevToolsServiceIfNeeded(shell::ApplicationManager* manager,
   }
 
   ServiceProviderPtr devtools_service_provider;
-  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:devtools_service"),
-                                    std::string(),
-                                    shell::GetPermissiveCapabilityFilter()));
+  scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
+  params->set_source(Identity(GURL("mojo:shell"), std::string(),
+                              GetPermissiveCapabilityFilter()));
+  params->SetTarget(Identity(GURL("mojo:devtools_service"), std::string(),
+                             GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&devtools_service_provider));
   manager->ConnectToApplication(std::move(params));
 
@@ -217,26 +215,26 @@ bool Context::Init(const base::FilePath& shell_file_root) {
                            task_runners_->io_runner(),
                            embedder::ScopedPlatformHandle());
 
-  package_manager_ = new shell::PackageManagerImpl(
-      shell_file_root, task_runners_->blocking_pool());
+  package_manager_ =
+      new PackageManagerImpl(shell_file_root, task_runners_->blocking_pool());
   InitContentHandlers(package_manager_, command_line);
 
   RegisterLocalAliases(package_manager_);
 
-  scoped_ptr<shell::NativeRunnerFactory> runner_factory;
+  scoped_ptr<NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kMojoSingleProcess)) {
 #if defined(COMPONENT_BUILD)
     LOG(ERROR) << "Running Mojo in single process component build, which isn't "
                << "supported because statics in apps interact. Use static build"
                << " or don't pass --single-process.";
 #endif
-    runner_factory.reset(new shell::InProcessNativeRunnerFactory(
-        task_runners_->blocking_pool()));
+    runner_factory.reset(
+        new InProcessNativeRunnerFactory(task_runners_->blocking_pool()));
   } else {
-    runner_factory.reset(new shell::OutOfProcessNativeRunnerFactory(
-        task_runners_->blocking_pool()));
+    runner_factory.reset(
+        new OutOfProcessNativeRunnerFactory(task_runners_->blocking_pool()));
   }
-  application_manager_.reset(new shell::ApplicationManager(
+  application_manager_.reset(new ApplicationManager(
       make_scoped_ptr(package_manager_), std::move(runner_factory),
       task_runners_->blocking_pool()));
 
@@ -244,12 +242,11 @@ bool Context::Init(const base::FilePath& shell_file_root) {
   ServiceProviderPtr tracing_exposed_services;
   new TracingServiceProvider(&tracer_, GetProxy(&tracing_exposed_services));
 
-  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(),
-                                    shell::GetPermissiveCapabilityFilter()));
+  scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
+  params->set_source(Identity(GURL("mojo:shell"), std::string(),
+                              GetPermissiveCapabilityFilter()));
+  params->SetTarget(Identity(GURL("mojo:tracing"), std::string(),
+                             GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&tracing_services));
   params->set_exposed_services(std::move(tracing_exposed_services));
   application_manager_->ConnectToApplication(std::move(params));
@@ -311,10 +308,9 @@ void Context::Run(const GURL& url) {
 
   app_urls_.insert(url);
 
-  scoped_ptr<shell::ConnectToApplicationParams> params(
-      new shell::ConnectToApplicationParams);
-  params->SetTarget(shell::Identity(url, std::string(),
-                                    shell::GetPermissiveCapabilityFilter()));
+  scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
+  params->SetTarget(
+      Identity(url, std::string(), GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&services));
   params->set_exposed_services(std::move(exposed_services));
   params->set_on_application_end(
@@ -352,5 +348,5 @@ void Context::OnApplicationEnd(const GURL& url) {
   }
 }
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo