Hook embedded shell up to MojoShellConnection

content/common/url_schemes.cc

Index: content/common/url_schemes.cc
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index c985e854ae17d5990d27d87c46f4576c6acc905b..018d9de77115c26505194f41f8c563b8b64028f1 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -36,6 +36,10 @@ void RegisterContentSchemes(bool lock_schemes) {
   url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kMetadataScheme, url::SCHEME_WITHOUT_AUTHORITY);
 
+  // TODO(rockot): Remove these. http://crbug.com/590012.
+  url::AddStandardScheme(kExeScheme, url::SCHEME_WITHOUT_AUTHORITY);
+  url::AddStandardScheme(kMojoScheme, url::SCHEME_WITHOUT_AUTHORITY);
+
   for (const url::SchemeWithType& scheme : additional_standard_schemes)
     url::AddStandardScheme(scheme.scheme, scheme.type);