Use std=c++11 instead of std=gnu++11 everywhere except nacl

sandbox/linux/services/credentials_unittest.cc

 // 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 "sandbox/linux/services/credentials.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <signal.h>
@@ skipping 13 matching lines @@
 #include "sandbox/linux/services/proc_util.h"
 #include "sandbox/linux/services/syscall_wrappers.h"
 #include "sandbox/linux/system_headers/capability.h"
 #include "sandbox/linux/tests/unit_tests.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 namespace {
 
-struct CapFreeDeleter {
-  inline void operator()(cap_t cap) const {
-    int ret = cap_free(cap);
-    CHECK_EQ(0, ret);
-  }
-};
-
-// Wrapper to manage libcap2's cap_t type.
-typedef scoped_ptr<typeof(*((cap_t)0)), CapFreeDeleter> ScopedCap;
-
 bool WorkingDirectoryIsRoot() {
   char current_dir[PATH_MAX];
   char* cwd = getcwd(current_dir, sizeof(current_dir));
   PCHECK(cwd);
   if (strcmp("/", cwd)) return false;
 
   // The current directory is the root. Add a few paranoid checks.
   struct stat current;
   CHECK_EQ(0, stat(".", &current));
   struct stat parrent;
@@ skipping 163 matching lines @@
   // Probably missing kernel support.
   if (!Credentials::MoveToNewUserNS())
     return;
 
   base::ScopedFD proc_fd(ProcUtil::OpenProc());
 
   std::vector<Credentials::Capability> caps;
   caps.push_back(Credentials::Capability::SYS_CHROOT);
   CHECK(Credentials::SetCapabilities(proc_fd.get(), caps));
 
-  ScopedCap actual_cap(cap_get_proc());
+  cap_t actual_cap(cap_get_proc());
   PCHECK(actual_cap != nullptr);
 
-  ScopedCap expected_cap(cap_init());
+  cap_t expected_cap(cap_init());
   PCHECK(expected_cap != nullptr);
 
   const cap_value_t allowed_cap = CAP_SYS_CHROOT;
   for (const cap_flag_t flag : {CAP_EFFECTIVE, CAP_PERMITTED}) {
-    PCHECK(cap_set_flag(expected_cap.get(), flag, 1, &allowed_cap, CAP_SET) ==
+    PCHECK(cap_set_flag(expected_cap, flag, 1, &allowed_cap, CAP_SET) ==
            0);
   }
 
-  CHECK_EQ(0, cap_compare(expected_cap.get(), actual_cap.get()));
+  CHECK_EQ(0, cap_compare(expected_cap, actual_cap));
+
+  CHECK_EQ(0, cap_free(expected_cap));
+  CHECK_EQ(0, cap_free(actual_cap));
 }
 
 volatile sig_atomic_t signal_handler_called;
 void SignalHandler(int sig) {
   signal_handler_called = 1;
 }
 
 // Disabled on ASAN because of crbug.com/451603.
 SANDBOX_TEST(Credentials, DISABLE_ON_ASAN(DropFileSystemAccessPreservesTLS)) {
   // Probably missing kernel support.
@@ skipping 10 matching lines @@
   action.sa_handler = &SignalHandler;
   PCHECK(sigaction(SIGUSR1, &action, nullptr) == 0);
 
   PCHECK(raise(SIGUSR1) == 0);
   CHECK_EQ(1, signal_handler_called);
 }
 
 }  // namespace.
 
 }  // namespace sandbox.