Wrap deprecated sandbox functions in C++ class.

content/common/sandbox_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/sandbox_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <CoreFoundation/CFTimeZone.h>
 extern "C" {
 #include <sandbox.h>

[Robert Sesek, 2016/04/05 14:13:25]

Remove now?

[Greg K, 2016/04/05 18:24:44]

Done.

 }
 #include <signal.h>
 #include <sys/param.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "content/common/gpu/media/vt_video_decode_accelerator_mac.h"
 #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"
 
 extern "C" {
 void CGSSetDenyWindowServerConnections(bool);
 void CGSShutdownServerConnections();
 
 int sandbox_init_with_parameters(const char* profile,

[Robert Sesek, 2016/04/05 14:13:25]

Might as well wrap this one, too.

[Greg K, 2016/04/05 18:24:44]

Done.

                                  uint64_t flags,
                                  const char* const parameters[],
                                  char** errorbuf);
 };
 
 namespace content {
 namespace {
 
 // Is the sandbox currently active.
 bool gSandboxIsActive = false;
@@ skipping 87 matching lines @@
   for (const auto& kv : params_map_) {
     params.push_back(kv.first.c_str());
     params.push_back(kv.second.c_str());
   }
   // 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)) {
     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::sandbox_free_error(error_internal);
     return false;
   }
   return true;
 }
 
 // static
 bool Sandbox::QuotePlainString(const std::string& src_utf8, std::string* dst) {
   dst->clear();
 
   const char* src = src_utf8.c_str();
@@ skipping 355 matching lines @@
   if (HANDLE_EINTR(fcntl(fd.get(), F_GETPATH, canonical_path)) != 0) {
     DPLOG(FATAL) << "GetCanonicalSandboxPath() failed for: "
                  << path.value();
     return path;
   }
 
   return base::FilePath(canonical_path);
 }
 
 }  // namespace content