Eliminate Quit() from Shell, and roll Shell & Connector together.

content/browser/frame_host/frame_mojo_shell.h

Index: content/browser/frame_host/frame_mojo_shell.h
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
index a3e2912fdf8b5deff1798dd45f323af612d8bd97..997b93bc51ea6fe9c3a150213f002b0abf5fc17d 100644
--- a/content/browser/frame_host/frame_mojo_shell.h
+++ b/content/browser/frame_host/frame_mojo_shell.h
@@ -19,20 +19,14 @@ class ServiceRegistryImpl;
 // This provides the |mojo::shell::mojom::Shell| service interface to each
 // frame's ServiceRegistry, giving frames the ability to connect to Mojo
 // applications.
-class FrameMojoShell : public mojo::shell::mojom::Shell,
-                       public mojo::shell::mojom::Connector {
+class FrameMojoShell : public mojo::shell::mojom::Connector {
  public:
   explicit FrameMojoShell(RenderFrameHost* frame_host);
   ~FrameMojoShell() override;
 
-  void BindRequest(
-      mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request);
+  void BindRequest(mojo::shell::mojom::ConnectorRequest request);
 
  private:
-  // mojo::Shell:
-  void GetConnector(mojo::shell::mojom::ConnectorRequest request) override;
-  void QuitApplication() override;
-
   // mojo::Connector:
   void Connect(
       const mojo::String& application_url,
@@ -45,7 +39,6 @@ class FrameMojoShell : public mojo::shell::mojom::Shell,
   ServiceRegistryImpl* GetServiceRegistry();
 
   RenderFrameHost* frame_host_;
-  mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_;
   mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_;
 
   // ServiceRegistry providing browser services to connected applications.