Split LoadAndRunNativeApplication() ...

shell/application_manager/application_manager.h

Index: shell/application_manager/application_manager.h
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index 3bcbc0cff66f9ff8819511ec99107884c33e3cd1..5a72c8528b4d8cc47a0ed4b06ca356f516eefea5 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -18,6 +18,7 @@
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/identity.h"
 #include "shell/application_manager/native_runner.h"
+#include "shell/native_application_support.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -182,12 +183,12 @@ class ApplicationManager {
                            ServiceProviderPtr exposed_services,
                            const base::Closure& on_application_end,
                            const std::vector<std::string>& parameters,
-                           NativeRunner::CleanupBehavior cleanup_behavior,
+                           NativeApplicationCleanup cleanup,
                            scoped_ptr<Fetcher> fetcher);
 
   void RunNativeApplication(InterfaceRequest<Application> application_request,
                             const NativeRunnerFactory::Options& options,
-                            NativeRunner::CleanupBehavior cleanup_behavior,
+                            NativeApplicationCleanup cleanup,
                             scoped_ptr<Fetcher> fetcher,
                             const base::FilePath& file_path,
                             bool path_exists);