Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Unified Diff: content/common/sandbox_mac.mm

Issue 1855303003: Wrap deprecated sandbox functions in C++ class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/BUILD.gn ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_mac.mm
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index c422bf7f8f2a7874583eb944edbe54edcf04a854..bc5a39dafa02fbbbd3fabe249f08c8358fd6a7d4 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -9,9 +9,6 @@
#include <stdint.h>
#include <CoreFoundation/CFTimeZone.h>
-extern "C" {
-#include <sandbox.h>
-}
#include <signal.h>
#include <sys/param.h>
@@ -39,6 +36,7 @@ extern "C" {
#include "content/grit/content_resources.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
+#include "sandbox/mac/seatbelt.h"
#include "third_party/icu/source/common/unicode/uchar.h"
#include "ui/base/layout.h"
#include "ui/gl/gl_surface.h"
@@ -46,11 +44,6 @@ extern "C" {
extern "C" {
void CGSSetDenyWindowServerConnections(bool);
void CGSShutdownServerConnections();
-
-int sandbox_init_with_parameters(const char* profile,
- uint64_t flags,
- const char* const parameters[],
- char** errorbuf);
};
namespace content {
@@ -152,13 +145,10 @@ bool SandboxCompiler::CompileAndApplyProfile(std::string* error) {
// The parameters array must be null terminated.
params.push_back(static_cast<const char*>(0));
- if (sandbox_init_with_parameters(profile_str_.c_str(), 0, params.data(),
- &error_internal)) {
+ if (sandbox::Seatbelt::InitWithParams(profile_str_.c_str(), 0, params.data(),
+ &error_internal)) {
error->assign(error_internal);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- sandbox_free_error(error_internal);
-#pragma clang diagnostic pop
+ sandbox::Seatbelt::FreeError(error_internal);
return false;
}
return true;
« no previous file with comments | « content/common/BUILD.gn ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698