Hook embedded shell up to MojoShellConnection

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 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 "content/browser/mojo/mojo_shell_context.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
+#include "content/common/mojo/mojo_shell_connection_impl.h"
 #include "content/common/mojo/static_application_loader.h"
 #include "content/common/process_control.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_params.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/native_runner.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
+#include "mojo/shell/runner/host/in_process_native_runner.h"
 
 namespace content {
 
 namespace {
 
+const char kBrowserAppUrl[] = "exe:chrome";
+
 // An extra set of apps to register on initialization, if set by a test.
 const MojoShellContext::StaticApplicationMap* g_applications_for_test;
 
 void StartUtilityProcessOnIOThread(
     mojo::InterfaceRequest<ProcessControl> request,
     const base::string16& process_name,
     bool use_sandbox) {
   UtilityProcessHost* process_host =
       UtilityProcessHost::Create(nullptr, nullptr);
   process_host->SetName(process_name);
@@ skipping 149 matching lines @@
   g_applications_for_test = apps;
 }
 
 MojoShellContext::MojoShellContext() {
   proxy_.Get().reset(new Proxy(this));
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
   bool register_mojo_url_schemes = false;
 
+  scoped_ptr<mojo::shell::NativeRunnerFactory> native_runner_factory(
+      new mojo::shell::InProcessNativeRunnerFactory(
+          BrowserThread::GetBlockingPool()));
   application_manager_.reset(new mojo::shell::ApplicationManager(
-      nullptr, file_task_runner.get(), register_mojo_url_schemes));
+      std::move(native_runner_factory), file_task_runner.get(),
+      register_mojo_url_schemes));
 
   application_manager_->set_default_loader(
       scoped_ptr<mojo::shell::ApplicationLoader>(new DefaultApplicationLoader));
 
   StaticApplicationMap apps;
   GetContentClient()->browser()->RegisterInProcessMojoApplications(&apps);
   if (g_applications_for_test) {
     // Add testing apps to the map, potentially overwriting whatever the
     // browser client registered.
     for (const auto& entry : *g_applications_for_test)
@@ skipping 26 matching lines @@
         scoped_ptr<mojo::shell::ApplicationLoader>(
             new UtilityProcessLoader(app.second, false /* use_sandbox */)),
         app.first);
   }
 
 #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
   application_manager_->SetLoaderForURL(
       scoped_ptr<mojo::shell::ApplicationLoader>(new GpuProcessLoader()),
       GURL("mojo:media"));
 #endif
+
+  if (!IsRunningInMojoShell()) {
+    MojoShellConnectionImpl::Create(
+        application_manager_->InitInstanceForEmbedder(GURL(kBrowserAppUrl)));
+  }
 }
 
 MojoShellContext::~MojoShellContext() {
 }
 
 // static
 void MojoShellContext::ConnectToApplication(
     const GURL& url,
     const GURL& requestor_url,
     mojo::shell::mojom::InterfaceProviderRequest request,
@@ skipping 20 matching lines @@
                             mojo::shell::GetPermissiveCapabilityFilter()));
   params->set_target(mojo::shell::Identity(
       url, std::string(), mojo::shell::mojom::Shell::kUserRoot, filter));
   params->set_remote_interfaces(std::move(request));
   params->set_local_interfaces(std::move(exposed_services));
   params->set_connect_callback(callback);
   application_manager_->Connect(std::move(params));
 }
 
 }  // namespace content