Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

mojo/shell/public/cpp/lib/connection_impl.h

 // Copyright 2014 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_LIB_CONNECTION_IMPL_H_
 #define MOJO_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 27 matching lines @@
   shell::mojom::Shell::ConnectToApplicationCallback
       GetConnectToApplicationCallback();
 
  private:
   // Connection:
   const std::string& GetConnectionURL() override;
   const std::string& GetRemoteApplicationURL() override;
   void SetRemoteInterfaceProviderConnectionErrorHandler(
       const Closure& handler) override;
   bool GetRemoteApplicationID(uint32_t* remote_id) const override;
-  bool GetRemoteShellClientFactoryID(
-      uint32_t* shell_client_factory_id) const override;
   void AddRemoteIDCallback(const Closure& callback) override;
   bool AllowsInterface(const std::string& interface_name) const override;
   shell::mojom::InterfaceProvider* GetRemoteInterfaces() override;
   InterfaceRegistry* GetLocalRegistry() override;
   base::WeakPtr<Connection> GetWeakPtr() override;
 
-  void OnGotRemoteIDs(uint32_t target_application_id,
-                      uint32_t shell_client_factory_id);
+  void OnGotInstanceID(uint32_t target_application_id);
 
   const std::string connection_url_;
   const std::string remote_url_;
 
   uint32_t remote_id_;
-  // The id of the shell_client_factory is only available once the callback from
-  // establishing the connection is made.
-  uint32_t shell_client_factory_id_;
   bool remote_ids_valid_;
   std::vector<Closure> remote_id_callbacks_;
 
   InterfaceRegistry local_registry_;
   shell::mojom::InterfaceProviderPtr remote_interfaces_;
 
   const std::set<std::string> allowed_interfaces_;
   const bool allow_all_interfaces_;
 
   base::WeakPtrFactory<ConnectionImpl> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ConnectionImpl);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_