Split LoadAndRunNativeApplication() ...

shell/in_process_native_runner.h

Index: shell/in_process_native_runner.h
diff --git a/shell/in_process_native_runner.h b/shell/in_process_native_runner.h
index 952b44869192deeed0022c12ff3d366e38a63716..f67373468c3ccf8f322ce433fd5ca62bd7e9a045 100644
--- a/shell/in_process_native_runner.h
+++ b/shell/in_process_native_runner.h
@@ -12,6 +12,7 @@
 #include "base/scoped_native_library.h"
 #include "base/threading/simple_thread.h"
 #include "shell/application_manager/native_runner.h"
+#include "shell/native_application_support.h"
 
 namespace mojo {
 namespace shell {
@@ -28,7 +29,7 @@ class InProcessNativeRunner : public NativeRunner,
 
   // |NativeRunner| method:
   void Start(const base::FilePath& app_path,
-             NativeRunner::CleanupBehavior cleanup_behavior,
+             NativeApplicationCleanup cleanup,
              InterfaceRequest<Application> application_request,
              const base::Closure& app_completed_callback) override;
 
@@ -37,7 +38,7 @@ class InProcessNativeRunner : public NativeRunner,
   void Run() override;
 
   base::FilePath app_path_;
-  NativeRunner::CleanupBehavior cleanup_behavior_;
+  NativeApplicationCleanup cleanup_;
   InterfaceRequest<Application> application_request_;
   base::Callback<bool(void)> app_completed_callback_runner_;