Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/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 "mojo/shell/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/process_info.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #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/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"
 #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/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #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.
 class Setup {
  public:
   Setup() {
     embedder::PreInitializeParentProcess();
     embedder::Init();
   }
 
   ~Setup() {}
 
  private:
   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",
                                   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 32 matching lines @@
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
     // TODO(eseidel): We should also validate that the mimetype is valid
     // net/base/mime_util.h could do this, but we don't want to depend on net.
     manager->RegisterContentHandler(parts[i], url);
   }
 }
 
-void InitDevToolsServiceIfNeeded(shell::ApplicationManager* manager,
+void InitDevToolsServiceIfNeeded(ApplicationManager* manager,
                                  const base::CommandLine& command_line) {
   if (!command_line.HasSwitch(devtools_service::kRemoteDebuggingPort))
     return;
 
   std::string port_str =
       command_line.GetSwitchValueASCII(devtools_service::kRemoteDebuggingPort);
   unsigned port;
   if (!base::StringToUint(port_str, &port) || port > 65535) {
     LOG(ERROR) << "Invalid value for switch "
                << devtools_service::kRemoteDebuggingPort << ": '" << port_str
                << "' is not a valid port number.";
     return;
   }
 
   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));
 
   devtools_service::DevToolsCoordinatorPtr devtools_coordinator;
   devtools_service_provider->ConnectToService(
       devtools_service::DevToolsCoordinator::Name_,
       GetProxy(&devtools_coordinator).PassMessagePipe());
   devtools_coordinator->Initialize(static_cast<uint16_t>(port));
 }
 
@@ skipping 53 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 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()));
 
   ServiceProviderPtr tracing_services;
   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));
 
   if (command_line.HasSwitch(tracing::kTraceStartup)) {
     tracing::TraceCollectorPtr coordinator;
     auto coordinator_request = GetProxy(&coordinator);
     tracing_services->ConnectToService(tracing::TraceCollector::Name_,
                                        coordinator_request.PassMessagePipe());
     tracer_.StartCollectingFromTracingService(std::move(coordinator));
@@ skipping 41 matching lines @@
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void Context::Run(const GURL& url) {
   DCHECK(app_complete_callback_.is_null());
   ServiceProviderPtr services;
   ServiceProviderPtr exposed_services;
 
   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(
       base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
   application_manager_->ConnectToApplication(std::move(params));
 }
 
 void Context::RunCommandLineApplication(const base::Closure& callback) {
   DCHECK(app_urls_.empty());
   DCHECK(app_complete_callback_.is_null());
@@ skipping 17 matching lines @@
                 task_runners_->shell_runner());
       if (app_complete_callback_.is_null()) {
         base::MessageLoop::current()->QuitWhenIdle();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo