Simplify the ApplicationLoader interface in preparation for changes.

shell/dynamic_application_loader.cc

Index: shell/dynamic_application_loader.cc
diff --git a/shell/dynamic_application_loader.cc b/shell/dynamic_application_loader.cc
index afc9a5395c241d4861400bc0d6feb4cddba02956..9367d39d15a7bddd382bbb564745d7b4ff9af029 100644
--- a/shell/dynamic_application_loader.cc
+++ b/shell/dynamic_application_loader.cc
@@ -60,7 +60,7 @@ class DynamicApplicationLoader::Loader {
          Context* context,
          DynamicServiceRunnerFactory* runner_factory,
          InterfaceRequest<Application> application_request,
-         ApplicationLoader::LoadCallback load_callback,
+         LoadCallback load_callback,
          const LoaderCompleteCallback& loader_complete_callback)
       : cleanup_behavior_(cleanup_behavior),
         application_request_(application_request.Pass()),
@@ -151,7 +151,7 @@ class DynamicApplicationLoader::Loader {
 
   DynamicServiceRunner::CleanupBehavior cleanup_behavior_;
   InterfaceRequest<Application> application_request_;
-  ApplicationLoader::LoadCallback load_callback_;
+  LoadCallback load_callback_;
   LoaderCompleteCallback loader_complete_callback_;
   Context* context_;
   MimeTypeToURLMap* mime_type_to_url_;
@@ -168,7 +168,7 @@ class DynamicApplicationLoader::LocalLoader : public Loader {
               Context* context,
               DynamicServiceRunnerFactory* runner_factory,
               InterfaceRequest<Application> application_request,
-              ApplicationLoader::LoadCallback load_callback,
+              LoadCallback load_callback,
               const LoaderCompleteCallback& loader_complete_callback)
       : Loader(DynamicServiceRunner::DontDeleteAppPath,
                mime_type_to_url,
@@ -257,7 +257,7 @@ class DynamicApplicationLoader::NetworkLoader : public Loader {
                 Context* context,
                 DynamicServiceRunnerFactory* runner_factory,
                 InterfaceRequest<Application> application_request,
-                ApplicationLoader::LoadCallback load_callback,
+                LoadCallback load_callback,
                 const LoaderCompleteCallback& loader_complete_callback)
       : Loader(DynamicServiceRunner::DeleteAppPath,
                mime_type_to_url,
@@ -470,7 +470,6 @@ void DynamicApplicationLoader::RegisterContentHandler(
 }
 
 void DynamicApplicationLoader::Load(
-    ApplicationManager* manager,
     const GURL& url,
     InterfaceRequest<Application> application_request,
     LoadCallback load_callback) {
@@ -492,12 +491,6 @@ void DynamicApplicationLoader::Load(
       loader_complete_callback_));
 }
 
-void DynamicApplicationLoader::OnApplicationError(ApplicationManager* manager,
-                                                  const GURL& url) {
-  // TODO(darin): What should we do about service errors? This implies that
-  // the app closed its handle to the service manager. Maybe we don't care?
-}
-
 void DynamicApplicationLoader::LoaderComplete(Loader* loader) {
   loaders_.erase(std::find(loaders_.begin(), loaders_.end(), loader));
 }