Add a mojo shell service to render frames

This adds a Shell service to each render frame's service
registry, allowing frames to connect to Mojo applications.
When connecting to an application, the frame identifies
itself using its SiteInstance's URL.

BUG=497474

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

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

1 files changed, 12 insertions, 4 deletions

diff --git a/content/browser/mojo/mojo_app_connection_impl.cc b/content/browser/mojo/mojo_app_connection_impl.cc
index d643bbf..4f567d9 100644
--- a/content/browser/mojo/mojo_app_connection_impl.cc
+++ b/content/browser/mojo/mojo_app_connection_impl.cc
@@ -8,12 +8,20 @@
 
 namespace content {
 
-scoped_ptr<MojoAppConnection> MojoAppConnection::Create(const GURL& url) {
-  return scoped_ptr<MojoAppConnection>(new MojoAppConnectionImpl(url));
+const char kBrowserMojoAppUrl[] = "system:content_browser";
+
+// static
+scoped_ptr<MojoAppConnection> MojoAppConnection::Create(
+    const GURL& url,
+    const GURL& requestor_url) {
+  return scoped_ptr<MojoAppConnection>(
+      new MojoAppConnectionImpl(url, requestor_url));
 }
 
-MojoAppConnectionImpl::MojoAppConnectionImpl(const GURL& url) {
-  MojoShellContext::ConnectToApplication(url, mojo::GetProxy(&services_));
+MojoAppConnectionImpl::MojoAppConnectionImpl(const GURL& url,
+                                             const GURL& requestor_url) {
+  MojoShellContext::ConnectToApplication(url, requestor_url,
+                                         mojo::GetProxy(&services_));
 }
 
 MojoAppConnectionImpl::~MojoAppConnectionImpl() {