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

mojo/shell/public/cpp/lib/connector_impl.cc

 // 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.
 
 #include "mojo/shell/public/cpp/lib/connector_impl.h"
 
 #include "mojo/shell/public/cpp/lib/connection_impl.h"
 
 namespace mojo {
 
 Connector::ConnectParams::ConnectParams(const std::string& url)
     : url_(url),
       user_id_(shell::mojom::Connector::kUserInherit) {
 }
 Connector::ConnectParams::~ConnectParams() {}
 
 ConnectorImpl::ConnectorImpl(shell::mojom::ConnectorPtrInfo unbound_state)
     : unbound_state_(std::move(unbound_state)) {}
+ConnectorImpl::ConnectorImpl(shell::mojom::ConnectorPtr connector,
+                             const base::Closure& connection_error_closure)
+    : connector_(std::move(connector)) {
+  connector_.set_connection_error_handler(connection_error_closure);
+  thread_checker_.reset(new base::ThreadChecker);
+}
 ConnectorImpl::~ConnectorImpl() {}
 
 scoped_ptr<Connection> ConnectorImpl::Connect(const std::string& url) {
   ConnectParams params(url);
   return Connect(&params);
 }
 
 scoped_ptr<Connection> ConnectorImpl::Connect(ConnectParams* params) {
   // Bind this object to the current thread the first time it is used to
   // connect.
@@ skipping 32 matching lines @@
 }
 
 scoped_ptr<Connector> ConnectorImpl::Clone() {
   shell::mojom::ConnectorPtr connector;
   connector_->Clone(GetProxy(&connector));
   return make_scoped_ptr(
       new ConnectorImpl(connector.PassInterface()));
 }
 
 }  // namespace mojo