Remove Client relationship between mojo.Shell/mojo.Application

shell/application_manager/application_manager.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 SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 54 matching lines @@
         ConnectToServiceByName(application_url, Interface::Name_);
     ptr->Bind(service_handle.Pass());
   }
 
   ScopedMessagePipeHandle ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name);
 
   void RegisterExternalApplication(const GURL& application_url,
                                    const std::vector<std::string>& args,
-                                   ScopedMessagePipeHandle shell_handle);
+                                   ApplicationPtr application);
 
   // Sets the default Loader to be used if not overridden by SetLoaderForURL()
   // or SetLoaderForScheme().
   void set_default_loader(scoped_ptr<ApplicationLoader> loader) {
     default_loader_ = loader.Pass();
   }
   // Sets a Loader to be used for a specific url.
   void SetLoaderForURL(scoped_ptr<ApplicationLoader> loader, const GURL& url);
   // Sets a Loader to be used for a specific url scheme.
   void SetLoaderForScheme(scoped_ptr<ApplicationLoader> loader,
@@ skipping 33 matching lines @@
 
   ShellImpl* GetShellImpl(const GURL& url);
 
   void ConnectToClient(ShellImpl* shell_impl,
                        const GURL& url,
                        const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);
 
   void LoadWithContentHandler(const GURL& content_handler_url,
-                              ScopedMessagePipeHandle shell_handle,
+                              InterfaceRequest<Application> application_request,
                               URLResponsePtr url_response);
 
   // Return the appropriate loader for |url|. This can return NULL if there is
   // no default loader configured.
   ApplicationLoader* GetLoaderForURL(const GURL& url,
                                      IncludeDefaultLoader fallback);
 
   // Removes a ContentHandler when it encounters an error.
   void OnContentHandlerError(ContentHandlerConnection* content_handler);
 
@@ skipping 11 matching lines @@
   URLToArgsMap url_to_args_;
 
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_