diff options
Diffstat (limited to 'chromium/content/browser/child_process_launcher_helper_mac.cc')
| -rw-r--r-- | chromium/content/browser/child_process_launcher_helper_mac.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/content/browser/child_process_launcher_helper_mac.cc b/chromium/content/browser/child_process_launcher_helper_mac.cc index fe69395324b..ebd44341ef2 100644 --- a/chromium/content/browser/child_process_launcher_helper_mac.cc +++ b/chromium/content/browser/child_process_launcher_helper_mac.cc @@ -25,6 +25,7 @@ #include "services/service_manager/sandbox/mac/common_v2.sb.h" #include "services/service_manager/sandbox/mac/gpu_v2.sb.h" #include "services/service_manager/sandbox/mac/nacl_loader.sb.h" +#include "services/service_manager/sandbox/mac/pdf_compositor.sb.h" #include "services/service_manager/sandbox/mac/ppapi_v2.sb.h" #include "services/service_manager/sandbox/mac/renderer_v2.sb.h" #include "services/service_manager/sandbox/mac/utility.sb.h" @@ -113,8 +114,10 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( case service_manager::SANDBOX_TYPE_RENDERER: profile += service_manager::kSeatbeltPolicyString_renderer_v2; break; - case service_manager::SANDBOX_TYPE_UTILITY: case service_manager::SANDBOX_TYPE_PDF_COMPOSITOR: + profile += service_manager::kSeatbeltPolicyString_pdf_compositor; + break; + case service_manager::SANDBOX_TYPE_UTILITY: case service_manager::SANDBOX_TYPE_PROFILING: profile += service_manager::kSeatbeltPolicyString_utility; break; @@ -137,10 +140,10 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( case service_manager::SANDBOX_TYPE_NACL_LOADER: case service_manager::SANDBOX_TYPE_PPAPI: case service_manager::SANDBOX_TYPE_RENDERER: + case service_manager::SANDBOX_TYPE_PDF_COMPOSITOR: SetupCommonSandboxParameters(seatbelt_exec_client_.get()); break; case service_manager::SANDBOX_TYPE_UTILITY: - case service_manager::SANDBOX_TYPE_PDF_COMPOSITOR: case service_manager::SANDBOX_TYPE_PROFILING: SetupUtilitySandboxParameters(seatbelt_exec_client_.get(), *command_line_.get()); @@ -151,7 +154,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( int pipe = seatbelt_exec_client_->SendProfileAndGetFD(); if (pipe < 0) { - LOG(ERROR) << "pipe for sending sandbox profile is an invalid FD"; + LOG(ERROR) << "Sending the seatbelt profile failed."; return false; } |