Mojo: Fix two bugs in content handling

mojo/application_manager/application_loader.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_LOADER_H_
 #define MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
 
 #include "base/memory/ref_counted.h"
 #include "mojo/application_manager/application_manager_export.h"
 #include "mojo/public/cpp/system/core.h"
@@ skipping 16 matching lines @@
   class MOJO_APPLICATION_MANAGER_EXPORT LoadCallbacks
       : public base::RefCounted<LoadCallbacks> {
    public:
     // Register the requested application with ApplicationManager. If the
     // returned handle is valid, it should be used to implement the
     // mojo::Application interface.
     virtual ScopedMessagePipeHandle RegisterApplication() = 0;
 
     // Load the requested application with a content handler.
     virtual void LoadWithContentHandler(const GURL& content_handler_url,
-                                        URLResponsePtr response) = 0;
+                                        URLResponsePtr url_response) = 0;
 
    protected:
     friend base::RefCounted<LoadCallbacks>;
     virtual ~LoadCallbacks() {}
   };
 
   // Implements RegisterApplication() by returning a handle that was specified
   // at construction time. LoadWithContentHandler() is not supported.
   class MOJO_APPLICATION_MANAGER_EXPORT SimpleLoadCallbacks
       : public LoadCallbacks {
@@ skipping 31 matching lines @@
   virtual void OnApplicationError(ApplicationManager* manager,
                                   const GURL& url) = 0;
 
  protected:
   ApplicationLoader() {}
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_