One feature of MojoShellContext in content is that Connect() can be called from any thread. If we want to replace this class we need this ability in the Mojo Shell client lib too. To this end I've extracted the Connect() method to its own interface which can be constructed from Shell. This interface can be cloned and passed on to other threads also.

R=sky@chromium.org
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1728083002

Cr-Commit-Position: refs/heads/master@{#377407}

1 files changed, 2 insertions, 2 deletions

diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc
index a966020..9b23657 100644
--- a/mojo/shell/standalone/context.cc
+++ b/mojo/shell/standalone/context.cc
@@ -157,7 +157,7 @@ void Context::Init(const base::FilePath& shell_file_root) {
   scoped_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
   params->set_target(Identity(GURL("mojo:tracing"), std::string(),
-                              mojom::Shell::kUserInherit,
+                              mojom::Connector::kUserInherit,
                               GetPermissiveCapabilityFilter()));
   params->set_remote_interfaces(GetProxy(&tracing_remote_interfaces));
   params->set_local_interfaces(std::move(tracing_local_interfaces));
@@ -229,7 +229,7 @@ void Context::Run(const GURL& url) {
   scoped_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
   params->set_target(
-      Identity(url, std::string(), mojom::Shell::kUserRoot,
+      Identity(url, std::string(), mojom::Connector::kUserRoot,
                GetPermissiveCapabilityFilter()));
   params->set_remote_interfaces(GetProxy(&remote_interfaces));
   params->set_local_interfaces(std::move(local_interfaces));