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

content/browser/frame_host/frame_mojo_shell.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_mojo_shell.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/browser/mojo/mojo_shell_context.h"
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 FrameMojoShell::FrameMojoShell(RenderFrameHost* frame_host)
     : frame_host_(frame_host) {
 }
 
 FrameMojoShell::~FrameMojoShell() {
 }
 
-void FrameMojoShell::BindRequest(
-    mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request) {
-  bindings_.AddBinding(this, std::move(shell_request));
-}
-
-void FrameMojoShell::GetConnector(
-    mojo::shell::mojom::ConnectorRequest request) {
+void FrameMojoShell::BindRequest(mojo::shell::mojom::ConnectorRequest request) {
   connectors_.AddBinding(this, std::move(request));
 }
 
-void FrameMojoShell::QuitApplication() {
-}
-
 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we
 // drop it and replace it with services we provide in the browser. In the
 // future we may need to support both.
 void FrameMojoShell::Connect(
     const mojo::String& application_url,
     uint32_t user_id,
     mojo::shell::mojom::InterfaceProviderRequest services,
     mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */,
     const mojo::shell::mojom::Connector::ConnectCallback& callback) {
   // TODO(beng): user_id is dropped on the floor right now. Figure out what to
@@ skipping 21 matching lines @@
     // different services for different apps for better isolation.
     RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
     GetContentClient()->browser()->RegisterFrameMojoShellServices(
         service_registry_.get(), frame_host_);
   }
 
   return service_registry_.get();
 }
 
 }  // namespace content