Index: sandbox/linux/services/credentials_unittest.cc |
diff --git a/sandbox/linux/services/credentials_unittest.cc b/sandbox/linux/services/credentials_unittest.cc |
index 6b93c86c3ecbc2104282b50da80e32f3d9ad06d3..db19f6fee561073c1dc7a0f0ba7dfc29b91abd65 100644 |
--- a/sandbox/linux/services/credentials_unittest.cc |
+++ b/sandbox/linux/services/credentials_unittest.cc |
@@ -177,17 +177,16 @@ |
base::ScopedFD proc_fd(ProcUtil::OpenProc()); |
- CHECK(Credentials::HasCapability(Credentials::Capability::SYS_ADMIN)); |
- CHECK(Credentials::HasCapability(Credentials::Capability::SYS_CHROOT)); |
- |
- std::vector<Credentials::Capability> caps; |
- caps.push_back(Credentials::Capability::SYS_CHROOT); |
+ CHECK(Credentials::HasCapability(LinuxCapability::kCapSysAdmin)); |
+ CHECK(Credentials::HasCapability(LinuxCapability::kCapSysChroot)); |
+ |
+ const std::vector<LinuxCapability> caps = {LinuxCapability::kCapSysChroot}; |
CHECK(Credentials::SetCapabilities(proc_fd.get(), caps)); |
- CHECK(!Credentials::HasCapability(Credentials::Capability::SYS_ADMIN)); |
- CHECK(Credentials::HasCapability(Credentials::Capability::SYS_CHROOT)); |
- |
- const std::vector<Credentials::Capability> no_caps; |
+ CHECK(!Credentials::HasCapability(LinuxCapability::kCapSysAdmin)); |
+ CHECK(Credentials::HasCapability(LinuxCapability::kCapSysChroot)); |
+ |
+ const std::vector<LinuxCapability> no_caps; |
CHECK(Credentials::SetCapabilities(proc_fd.get(), no_caps)); |
CHECK(!Credentials::HasAnyCapability()); |
} |
@@ -199,11 +198,10 @@ |
base::ScopedFD proc_fd(ProcUtil::OpenProc()); |
- CHECK(Credentials::HasCapability(Credentials::Capability::SYS_CHROOT)); |
+ CHECK(Credentials::HasCapability(LinuxCapability::kCapSysChroot)); |
PCHECK(chroot("/") == 0); |
- std::vector<Credentials::Capability> caps; |
- caps.push_back(Credentials::Capability::SYS_CHROOT); |
+ const std::vector<LinuxCapability> caps = {LinuxCapability::kCapSysChroot}; |
CHECK(Credentials::SetCapabilities(proc_fd.get(), caps)); |
PCHECK(chroot("/") == 0); |
@@ -218,8 +216,7 @@ |
base::ScopedFD proc_fd(ProcUtil::OpenProc()); |
- std::vector<Credentials::Capability> caps; |
- caps.push_back(Credentials::Capability::SYS_CHROOT); |
+ const std::vector<LinuxCapability> caps = {LinuxCapability::kCapSysChroot}; |
CHECK(Credentials::SetCapabilities(proc_fd.get(), caps)); |
ScopedCap actual_cap(cap_get_proc()); |