Pass ServiceProvider and ServiceProvider& params in Connect

mojo/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 MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 29 matching lines @@
     static bool HasCreatedInstance();
     // Returns true if there is a ShellImpl for this URL.
     bool HasFactoryForURL(const GURL& url) const;
 
    private:
     ApplicationManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
-  ApplicationManager(Delegate* delegate);
+  explicit ApplicationManager(Delegate* delegate);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   void ConnectToApplication(const GURL& application_url,
                             const GURL& requestor_url,
-                            ServiceProviderPtr service_provider);
+                            InterfaceRequest<ServiceProvider> services,
+                            ServiceProviderPtr exposed_services);
 
   template <typename Interface>
   inline void ConnectToService(const GURL& application_url,
                                InterfacePtr<Interface>* ptr) {
     ScopedMessagePipeHandle service_handle =
         ConnectToServiceByName(application_url, Interface::Name_);
     ptr->Bind(service_handle.Pass());
   }
 
   ScopedMessagePipeHandle ConnectToServiceByName(
@@ skipping 33 matching lines @@
 
   typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
   typedef std::map<GURL, ApplicationLoader*> URLToLoaderMap;
   typedef std::map<GURL, ShellImpl*> URLToShellImplMap;
   typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap;
   typedef std::map<GURL, std::vector<std::string> > URLToArgsMap;
 
   void ConnectToApplicationImpl(const GURL& requested_url,
                                 const GURL& resolved_url,
                                 const GURL& requestor_url,
-                                ServiceProviderPtr service_provider,
+                                InterfaceRequest<ServiceProvider> services,
+                                ServiceProviderPtr exposed_services,
                                 ApplicationLoader* loader);
 
   void ConnectToClient(ShellImpl* shell_impl,
                        const GURL& url,
                        const GURL& requestor_url,
-                       ServiceProviderPtr service_provider);
+                       InterfaceRequest<ServiceProvider> services,
+                       ServiceProviderPtr exposed_services);
 
   void LoadWithContentHandler(const GURL& content_handler_url,
                               ScopedMessagePipeHandle shell_handle,
                               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);
 
@@ skipping 17 matching lines @@
   URLToArgsMap url_to_args_;
 
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_