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

content/renderer/render_frame_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 1145 matching lines @@
   // The push messaging dispatcher attached to this frame, lazily initialized.
   PushMessagingDispatcher* push_messaging_dispatcher_;
 
   // The presentation dispatcher implementation attached to this frame, lazily
   // initialized.
   PresentationDispatcher* presentation_dispatcher_;
 
   ServiceRegistryImpl service_registry_;
 
   // The shell proxy used to connect to Mojo applications.
-  mojo::shell::mojom::ShellPtr mojo_shell_;
+  mojo::shell::mojom::ConnectorPtr mojo_shell_;

[sky, 2016/02/25 17:13:09]

mojo_shell_-> connector_?

 
   // The screen orientation dispatcher attached to the frame, lazily
   // initialized.
   ScreenOrientationDispatcher* screen_orientation_dispatcher_;
 
   // The Manifest Manager handles the manifest requests from the browser
   // process.
   ManifestManager* manifest_manager_;
 
   // The current accessibility mode.
@@ skipping 32 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_