| Index: shell/app_child_process.cc
|
| diff --git a/shell/app_child_process.cc b/shell/app_child_process.cc
|
| index 3a00843a7aa53f08a708c5a2ec9ac54146b8d2cd..0091bb015a8eb6fc009d56651c608e7768d27c4f 100644
|
| --- a/shell/app_child_process.cc
|
| +++ b/shell/app_child_process.cc
|
| @@ -184,13 +184,16 @@ class AppChildControllerImpl : public InterfaceImpl<AppChildController> {
|
|
|
| // |AppChildController| methods:
|
| void StartApp(const String& app_path,
|
| + uint8_t cleanup_behavior,
|
| ScopedMessagePipeHandle service) override {
|
| DVLOG(2) << "AppChildControllerImpl::StartApp(" << app_path << ", ...)";
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| - unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread,
|
| - base::FilePath::FromUTF8Unsafe(app_path),
|
| - base::Passed(&service)));
|
| + unblocker_.Unblock(base::Bind(
|
| + &AppChildControllerImpl::StartAppOnMainThread,
|
| + base::FilePath::FromUTF8Unsafe(app_path),
|
| + static_cast<DynamicServiceRunner::CleanupBehavior>(cleanup_behavior),
|
| + base::Passed(&service)));
|
| }
|
|
|
| private:
|
| @@ -205,15 +208,18 @@ class AppChildControllerImpl : public InterfaceImpl<AppChildController> {
|
| channel_info_ = channel_info;
|
| }
|
|
|
| - static void StartAppOnMainThread(const base::FilePath& app_path,
|
| - ScopedMessagePipeHandle service) {
|
| + static void StartAppOnMainThread(
|
| + const base::FilePath& app_path,
|
| + DynamicServiceRunner::CleanupBehavior cleanup_behavior,
|
| + ScopedMessagePipeHandle service) {
|
| // TODO(vtl): This is copied from in_process_dynamic_service_runner.cc.
|
| DVLOG(2) << "Loading/running Mojo app from " << app_path.value()
|
| << " out of process";
|
|
|
| // We intentionally don't unload the native library as its lifetime is the
|
| // same as that of the process.
|
| - DynamicServiceRunner::LoadAndRunService(app_path, service.Pass());
|
| + DynamicServiceRunner::LoadAndRunService(app_path, cleanup_behavior,
|
| + service.Pass());
|
| }
|
|
|
| base::ThreadChecker thread_checker_;
|
|
|