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

mojo/shell/public/cpp/connector.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_CONNECTOR_H_
 #define MOJO_SHELL_PUBLIC_CPP_CONNECTOR_H_
 
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 
 // An interface that encapsulates the Mojo Shell's broker interface by which
 // connections between applications are established. Once Connect() is called,
 // this class is bound to the thread the call was made on and it cannot be
 // passed to another thread without calling Clone().
 // An instance of this class is created internally by ShellConnection for use
 // on the thread ShellConnection is instantiated on, and this interface is
 // wrapped by the Shell interface.
 // To use this interface on other threads, call Shell::CloneConnector() and
 // pass the result to another thread. To pass to subsequent threads, call
 // Clone() on instances of this object.
 // While instances of this object are owned by the caller, the underlying
 // connection with the shell is bound to the lifetime of the instance that
 // created it, i.e. when the application is terminated the Connector pipe is
 // closed.
 class Connector {
  public:
+  virtual ~Connector() {}
+
   class ConnectParams {
    public:
     explicit ConnectParams(const std::string& url);
     ~ConnectParams();
 
     const GURL& url() { return url_; }
     void set_user_id(uint32_t user_id) { user_id_ = user_id; }
     uint32_t user_id() const { return user_id_; }
 
    private:
@@ skipping 29 matching lines @@
 
   // Creates a new instance of this class which may be passed to another thread.
   // The returned object may be passed multiple times until Connect() is called,
   // at which point this method must be called again to pass again.
   virtual scoped_ptr<Connector> Clone() = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_CONNECTOR_H_