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.

Reland of https://codereview.chromium.org/1164163002/
which should guard more safely against bad bot behavior
with isolates.

BUG=497474
TBR=jam@chromium.org

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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/content/browser/mojo_shell_browsertest.cc b/content/browser/mojo_shell_browsertest.cc
index 3dcde73..b291961 100644
--- a/content/browser/mojo_shell_browsertest.cc
+++ b/content/browser/mojo_shell_browsertest.cc
@@ -35,7 +35,8 @@ class MojoShellTest : public ContentBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(MojoShellTest, TestBrowserConnection) {
-  auto test_app = MojoAppConnection::Create(GURL(kInProcessTestMojoAppUrl));
+  auto test_app = MojoAppConnection::Create(GURL(kInProcessTestMojoAppUrl),
+                                            GURL(kBrowserMojoAppUrl));
   TestMojoServicePtr test_service;
   test_app->ConnectToService(&test_service);
 
@@ -48,7 +49,8 @@ IN_PROC_BROWSER_TEST_F(MojoShellTest, TestUtilityConnection) {
   // With no loader registered at this URL, the shell should spawn a utility
   // process and connect us to it. content_shell's utility process always hosts
   // a TestMojoApp at |kTestMojoAppUrl|.
-  auto test_app = MojoAppConnection::Create(GURL(kTestMojoAppUrl));
+  auto test_app = MojoAppConnection::Create(GURL(kTestMojoAppUrl),
+                                            GURL(kBrowserMojoAppUrl));
   TestMojoServicePtr test_service;
   test_app->ConnectToService(&test_service);