Eliminate FrameMojoShell.

content/browser/mojo/mojo_shell_context.h

Index: content/browser/mojo/mojo_shell_context.h
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
index 6de10cf146762752d5b31075fdf6e2eaeafdfa38..8602773e0402b741e09a29d09590b8f021fe8504 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/mojo_shell_context.h
@@ -10,10 +10,8 @@
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
-#include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "content/common/content_export.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/service_manager.h"
 
 namespace catalog {
@@ -29,35 +27,11 @@ class CONTENT_EXPORT MojoShellContext {
   MojoShellContext();
   ~MojoShellContext();
 
-  // Connects an application at |name| and gets a handle to its exposed
-  // services. This is only intended for use in browser code that's not part of
-  // some Mojo application. May be called from any thread. |requestor_name| is
-  // given to the target application as the requestor's name upon connection.
-  static void ConnectToApplication(
-      const std::string& user_id,
-      const std::string& name,
-      const std::string& requestor_name,
-      shell::mojom::InterfaceProviderRequest request,
-      shell::mojom::InterfaceProviderPtr exposed_services,
-      const shell::mojom::Connector::ConnectCallback& callback);
-
   // Returns a shell::Connector that can be used on the IO thread.
   static shell::Connector* GetConnectorForIOThread();
 
  private:
   class BuiltinManifestProvider;
-  class Proxy;
-  friend class Proxy;
-
-  void ConnectToApplicationOnOwnThread(
-      const std::string& user_id,
-      const std::string& name,
-      const std::string& requestor_name,
-      shell::mojom::InterfaceProviderRequest request,
-      shell::mojom::InterfaceProviderPtr exposed_services,
-      const shell::mojom::Connector::ConnectCallback& callback);
-
-  static base::LazyInstance<std::unique_ptr<Proxy>> proxy_;
 
   std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
   std::unique_ptr<catalog::Catalog> catalog_;