Simplify the ApplicationLoader interface in preparation for changes.

shell/dynamic_application_loader.h

Index: shell/dynamic_application_loader.h
diff --git a/shell/dynamic_application_loader.h b/shell/dynamic_application_loader.h
index e91bcea29bb025a94343e8668eb1e8375802f974..1947e5bc5896c5c8751dece3b743dbb01bcdd19f 100644
--- a/shell/dynamic_application_loader.h
+++ b/shell/dynamic_application_loader.h
@@ -24,10 +24,12 @@ class Context;
 class DynamicServiceRunnerFactory;
 class DynamicServiceRunner;
 
-// An implementation of ApplicationLoader that retrieves a dynamic library
-// containing the implementation of the service and loads/runs it (via a
-// DynamicServiceRunner).
-class DynamicApplicationLoader : public ApplicationLoader {
+// Loads applications that might be either DSOs or content applications.
+// TODO(aa): Tear this apart into:
+// - fetching urls (probably two sublcasses for http/file)
+// - detecting type of response (dso, content, nacl (future))
+// - executing response (either via DynamicServiceRunner or a content handler)
+class DynamicApplicationLoader : public mojo::DynamicApplicationLoader {
  public:
   DynamicApplicationLoader(
       Context* context,
@@ -37,13 +39,9 @@ class DynamicApplicationLoader : public ApplicationLoader {
   void RegisterContentHandler(const std::string& mime_type,
                               const GURL& content_handler_url);
 
-  // ApplicationLoader methods:
-  void Load(ApplicationManager* manager,
-            const GURL& url,
+  void Load(const GURL& url,
             InterfaceRequest<Application> application_request,
             LoadCallback callback) override;
-  void OnApplicationError(ApplicationManager* manager,
-                          const GURL& url) override;
 
  private:
   class Loader;