Mojo: Fix two bugs in content handling

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 "base/basictypes.h"
@@ skipping 102 matching lines @@
   void ConnectToClient(ShellImpl* shell_impl,
                        const GURL& url,
                        const GURL& requestor_url,
                        ServiceProviderPtr service_provider);
 
   void RegisterLoadedApplication(const GURL& service_url,
                                  const GURL& requestor_url,
                                  ServiceProviderPtr service_provider,
                                  ScopedMessagePipeHandle* shell_handle);
 
-  void LoadWithContentHandler(const GURL& content_url,
-                              const GURL& requestor_url,
-                              const GURL& content_handler_url,
-                              URLResponsePtr content,
-                              ServiceProviderPtr service_provider);
+  void LoadWithContentHandler(
+      const GURL& content_url,
+      const GURL& requestor_url,
+      const GURL& content_handler_url,
+      URLResponsePtr url_response,
+      URLLoaderPtr url_loader,
+      ServiceProviderPtr service_provider);
 
   // Returns the Loader to use for a url (using default if not overridden.)
   // The preference is to use a loader that's been specified for an url first,
   // then one that's been specified for a scheme, then the default.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   // Removes a ShellImpl when it encounters an error.
   void OnShellImplError(ShellImpl* shell_impl);
 
   Delegate* delegate_;
   // Loader management.
   URLToLoaderMap url_to_loader_;
   SchemeToLoaderMap scheme_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
   Interceptor* interceptor_;
 
   URLToShellImplMap url_to_shell_impl_;
   URLToContentHandlerMap url_to_content_handler_;
 
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_