Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

mojo/shell/package_test_package.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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 18 matching lines @@
 
 using GetNameCallback = test::mojom::PackageTestService::GetNameCallback;
 
 class ProvidedShellClient
     : public ShellClient,
       public InterfaceFactory<test::mojom::PackageTestService>,
       public test::mojom::PackageTestService,
       public base::SimpleThread {
  public:
   ProvidedShellClient(const std::string& name,
-                      mojom::ShellClientRequest request,
-                      const Callback<void()>& destruct_callback)
+                      mojom::ShellClientRequest request)
       : base::SimpleThread(name),
         name_(name),
         request_(std::move(request)),
-        destruct_callback_(destruct_callback),
         shell_(nullptr) {
     Start();
   }
   ~ProvidedShellClient() override {
     Join();
-    destruct_callback_.Run();
   }
 
  private:
   // mojo::ShellClient:
   void Initialize(Shell* shell, const std::string& url, uint32_t id) override {
     shell_ = shell;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
@@ skipping 21 matching lines @@
     delete this;
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       shell_->Quit();
   }
 
   const std::string name_;
   mojom::ShellClientRequest request_;
-  const Callback<void()> destruct_callback_;
   Shell* shell_;
   WeakBindingSet<test::mojom::PackageTestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedShellClient);
 };
 
 class PackageTestShellClient
     : public ShellClient,
       public InterfaceFactory<mojom::ShellClientFactory>,
       public InterfaceFactory<test::mojom::PackageTestService>,
@@ skipping 24 matching lines @@
   }
 
   // InterfaceFactory<test::mojom::PackageTestService>:
   void Create(Connection* connection,
               test::mojom::PackageTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ShellClientFactory:
   void CreateShellClient(mojom::ShellClientRequest request,
-                         const String& url,
-                         const Callback<void()>& destruct_callback) override {
+                         const String& url) override {
     if (url == "mojo://package_test_a/")
-      new ProvidedShellClient("A", std::move(request), destruct_callback);
+      new ProvidedShellClient("A", std::move(request));
     else if (url == "mojo://package_test_b/")
-      new ProvidedShellClient("B", std::move(request), destruct_callback);
+      new ProvidedShellClient("B", std::move(request));
   }
 
   // test::mojom::PackageTestService:
   void GetName(const GetNameCallback& callback) override {
     callback.Run("ROOT");
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       shell_->Quit();
   }
 
   Shell* shell_;
   std::vector<scoped_ptr<ShellClient>> delegates_;
   WeakBindingSet<mojom::ShellClientFactory> shell_client_factory_bindings_;
   WeakBindingSet<test::mojom::PackageTestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageTestShellClient);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = mojo::ApplicationRunner(
       new mojo::shell::PackageTestShellClient).Run(shell_handle);
   return rv;
 }