Embed a simple Mojo shell in content

chrome/browser/net/mojo_app_proxy_resolver_factory.h

Index: chrome/browser/net/mojo_app_proxy_resolver_factory.h
diff --git a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h b/chrome/browser/net/mojo_app_proxy_resolver_factory.h
similarity index 51%
rename from chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h
rename to chrome/browser/net/mojo_app_proxy_resolver_factory.h
index da17a3cbd4b00223b546cfd0e45d22bb256213a8..f5b4128621daa4d309f9211d495a4ad22112b26a 100644
--- a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h
+++ b/chrome/browser/net/mojo_app_proxy_resolver_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NET_UTILITY_PROCESS_MOJO_PROXY_RESOLVER_FACTORY_H_
-#define CHROME_BROWSER_NET_UTILITY_PROCESS_MOJO_PROXY_RESOLVER_FACTORY_H_
+#ifndef CHROME_BROWSER_NET_MOJO_APP_PROXY_RESOLVER_FACTORY_H_
+#define CHROME_BROWSER_NET_MOJO_APP_PROXY_RESOLVER_FACTORY_H_
 
 #include "base/macros.h"
 #include "net/interfaces/proxy_resolver_service.mojom.h"
@@ -11,15 +11,21 @@
 template <typename Type>
 struct DefaultSingletonTraits;
 
+namespace content {
+class MojoShellProxy;
+}
+
+namespace mojo {
+class ApplicationConnection;
+}
+
 // A factory used to create connections to Mojo proxy resolver services run in a
-// utility process. All Mojo proxy resolver services will be run in the same
-// utility process. Utility process crashes are detected and the utility
-// process is automatically restarted.
-class UtilityProcessMojoProxyResolverFactory
+// Mojo application.
+class MojoAppProxyResolverFactory
     : public net::interfaces::ProxyResolverFactory,
       public mojo::ErrorHandler {
  public:
-  static UtilityProcessMojoProxyResolverFactory* GetInstance();
+  static MojoAppProxyResolverFactory* GetInstance();
 
   // Overridden from net::interfaces::ProxyResolverFactory:
   void CreateResolver(
@@ -29,20 +35,16 @@ class UtilityProcessMojoProxyResolverFactory
       net::interfaces::ProxyResolverFactoryRequestClientPtr client) override;
 
  private:
-  friend struct DefaultSingletonTraits<UtilityProcessMojoProxyResolverFactory>;
-  UtilityProcessMojoProxyResolverFactory();
-  ~UtilityProcessMojoProxyResolverFactory() override;
+  friend struct DefaultSingletonTraits<MojoAppProxyResolverFactory>;
+  MojoAppProxyResolverFactory();
+  ~MojoAppProxyResolverFactory() override;
 
   // Overridden from mojo::ErrorHandler:
   void OnConnectionError() override;
 
-  // Creates a new utility process and connects to its Mojo proxy resolver
-  // factory.
-  void CreateProcessAndConnect();
-
   net::interfaces::ProxyResolverFactoryPtr resolver_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(UtilityProcessMojoProxyResolverFactory);
+  DISALLOW_COPY_AND_ASSIGN(MojoAppProxyResolverFactory);
 };
 
-#endif  // CHROME_BROWSER_NET_UTILITY_PROCESS_MOJO_PROXY_RESOLVER_FACTORY_H_
+#endif  // CHROME_BROWSER_NET_MOJO_APP_PROXY_RESOLVER_FACTORY_H_