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

mojo/shell/public/cpp/shell.h

 // Copyright 2016 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 MOJO_SHELL_PUBLIC_CPP_SHELL_H_
 #define MOJO_SHELL_PUBLIC_CPP_SHELL_H_
 
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
@@ skipping 39 matching lines @@
   void ConnectToInterface(const std::string& url,
                           InterfacePtr<Interface>* ptr) {
     Connector::ConnectParams params(url);
     return ConnectToInterface(&params, ptr);
   }
 
   // Returns a clone of the ShellConnection's Connector that can be passed to
   // other threads.
   virtual scoped_ptr<Connector> CloneConnector() const = 0;
 
-  // Initiate shutdown of this application. This may involve a round trip to the
-  // Shell to ensure there are no inbound service requests.
+  // Quits the message loop run by the ApplicationRunner, which causes this
+  // object to be destructed and the application to quit.
   virtual void Quit() = 0;
 
   // Create an object that can be used to refcount the lifetime of the
   // application. The returned object may be cloned, and when the refcount falls
   // to zero Quit() is called.
   virtual scoped_ptr<AppRefCount> CreateAppRefCount() = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_SHELL_H_