Mojo: Fix two bugs in content handling

mojo/application_manager/application_loader.h

Index: mojo/application_manager/application_loader.h
diff --git a/mojo/application_manager/application_loader.h b/mojo/application_manager/application_loader.h
index 5e89a061c4a32557f74a949e704e4c0b677891fe..ad8b80aab11d1f21a673ea3c162bb0a6a2885904 100644
--- a/mojo/application_manager/application_loader.h
+++ b/mojo/application_manager/application_loader.h
@@ -34,7 +34,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
 
     // Load the requested application with a content handler.
     virtual void LoadWithContentHandler(const GURL& content_handler_url,
-                                        URLResponsePtr response) = 0;
+                                        URLResponsePtr url_response,

[darin (slow to review), 2014/08/27 06:34:19]

Did you considered using ContentHandlerResponsePtr here as well? Maybe the extra
level of indirection would be annoying?

[Aaron Boodman, 2014/08/27 18:26:13]

I did consider that... I didn't do it because it didn't really cut down on
duplication. Callers already have a |url_response| and a |url_loader|. Making
them pass ContentHandlerResponsePtr just forces them to write extra code to
create the struct. It also felt a little weird to have the loaders have to
include content_handler.mojom.h.

It's a minor thing though, I'll change it if you like.

+                                        URLLoaderPtr url_loader) = 0;
 
    protected:
     friend base::RefCounted<LoadCallbacks>;
@@ -49,7 +50,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
     SimpleLoadCallbacks(ScopedMessagePipeHandle shell_handle);
     virtual ScopedMessagePipeHandle RegisterApplication() OVERRIDE;
     virtual void LoadWithContentHandler(const GURL& content_handler_url,
-                                        URLResponsePtr response) OVERRIDE;
+                                        URLResponsePtr response,
+                                        URLLoaderPtr loader) OVERRIDE;
 
    private:
     ScopedMessagePipeHandle shell_handle_;