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

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 "base/macros.h"
@@ skipping 63 matching lines @@
   };
 
   ApplicationManager(const Options& options, Delegate* delegate);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   void ConnectToApplication(
       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>
   inline void ConnectToService(const GURL& application_url,
                                mojo::InterfacePtr<Interface>* ptr) {
     mojo::ScopedMessagePipeHandle service_handle =
         ConnectToServiceByName(application_url, Interface::Name_);
     ptr->Bind(mojo::InterfaceHandle<Interface>(service_handle.Pass(), 0u));
   }
 
@@ skipping 54 matching lines @@
   using IdentityToContentHandlerMap =
       std::map<Identity, scoped_ptr<ContentHandlerConnection>>;
   using URLToArgsMap = std::map<GURL, std::vector<std::string>>;
   using MimeTypeToURLMap = std::map<std::string, GURL>;
   using URLToNativeOptionsMap = std::map<GURL, NativeApplicationOptions>;
 
   void ConnectToApplicationWithParameters(
       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);
 
   // Creates an Identity for the service identified by |resolved_url|.
   // If |new_process_per_connection| is true for the URL's options, then the
   // identity is unique. Otherwise, repeated invocations with the same
   // |resolved_url| will result in an equivalent Identity. If |strip_query| is
   // true, the query is stripped before creating the Identity.
   Identity MakeApplicationIdentity(const GURL& resolved_url,
                                    bool strip_query = true);
 
   mojo::InterfaceRequest<mojo::Application> RegisterShell(
       // The URL after resolution and redirects, including the querystring.
       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);
 
   void RunNativeApplication(
       mojo::InterfaceRequest<mojo::Application> application_request,
       const NativeApplicationOptions& options,
       scoped_ptr<Fetcher> fetcher,
       const base::FilePath& file_path,
       bool path_exists);
@@ skipping 38 matching lines @@
   ScopedVector<NativeRunner> native_runners_;
   bool initialized_authentication_interceptor_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_