Neuter the wrong-way ServiceProvider (a.k.a. exposed_services).

shell/application_manager/application_manager.h

Index: shell/application_manager/application_manager.h
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index 72cc947547e1faa3d4e90b6dfd587f5b2a9b93e4..edfb46ec90ac0d118d10e94e5c7ced7aff64a22e 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -81,7 +81,6 @@ class ApplicationManager {
       const GURL& application_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end);
 
   template <typename Interface>
@@ -156,21 +155,18 @@ class ApplicationManager {
       const GURL& application_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& pre_redirect_parameters);
 
   bool ConnectToRunningApplication(
       const GURL& resolved_url,
       const GURL& requestor_url,
-      mojo::InterfaceRequest<mojo::ServiceProvider>* services,
-      mojo::InterfaceHandle<mojo::ServiceProvider>* exposed_services);
+      mojo::InterfaceRequest<mojo::ServiceProvider>* services);
 
   bool ConnectToApplicationWithLoader(
       const GURL& resolved_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider>* services,
-      mojo::InterfaceHandle<mojo::ServiceProvider>* exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters,
       ApplicationLoader* loader);
@@ -188,23 +184,19 @@ class ApplicationManager {
       const GURL& resolved_url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters);
 
   ShellImpl* GetShellImpl(const GURL& url);
 
-  void ConnectToClient(
-      ShellImpl* shell_impl,
-      const GURL& resolved_url,
-      const GURL& requestor_url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services);
+  void ConnectToClient(ShellImpl* shell_impl,
+                       const GURL& resolved_url,
+                       const GURL& requestor_url,
+                       mojo::InterfaceRequest<mojo::ServiceProvider> services);
 
   void HandleFetchCallback(
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
       const base::Closure& on_application_end,
       const std::vector<std::string>& parameters,
       scoped_ptr<Fetcher> fetcher);