| Index: sandbox/mac/bootstrap_sandbox_unittest.mm
|
| diff --git a/sandbox/mac/bootstrap_sandbox_unittest.mm b/sandbox/mac/bootstrap_sandbox_unittest.mm
|
| index 467189e134fa9fd74b9f8dc6756bda4ff3f34451..6ef1937fecb158a1658c8df3d95bfe14b39567b8 100644
|
| --- a/sandbox/mac/bootstrap_sandbox_unittest.mm
|
| +++ b/sandbox/mac/bootstrap_sandbox_unittest.mm
|
| @@ -80,11 +80,6 @@ NSString* const kTestNotification = @"org.chromium.bootstrap_sandbox_test";
|
|
|
| namespace sandbox {
|
|
|
| -void InitializeXPCIfRequired() {
|
| - if (base::mac::IsOSYosemiteOrLater())
|
| - CHECK(InitializeXPC());
|
| -}
|
| -
|
| class BootstrapSandboxTest : public base::MultiProcessTest {
|
| public:
|
| void SetUp() override {
|
| @@ -179,8 +174,6 @@ TEST_F(BootstrapSandboxTest, DistributedNotifications_SandboxAllow) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(PostNotification) {
|
| - InitializeXPCIfRequired();
|
| -
|
| [[NSDistributedNotificationCenter defaultCenter]
|
| postNotificationName:kTestNotification
|
| object:[NSString stringWithFormat:@"%d", getpid()]];
|
| @@ -198,8 +191,6 @@ TEST_F(BootstrapSandboxTest, PolicyDenyError) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(PolicyDenyError) {
|
| - InitializeXPCIfRequired();
|
| -
|
| mach_port_t port = MACH_PORT_NULL;
|
| kern_return_t kr = bootstrap_look_up(bootstrap_port, kTestServer,
|
| &port);
|
| @@ -223,8 +214,6 @@ TEST_F(BootstrapSandboxTest, PolicyDenyDummyPort) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(PolicyDenyDummyPort) {
|
| - InitializeXPCIfRequired();
|
| -
|
| mach_port_t port = MACH_PORT_NULL;
|
| kern_return_t kr = bootstrap_look_up(bootstrap_port, kTestServer,
|
| &port);
|
| @@ -290,8 +279,6 @@ TEST_F(BootstrapSandboxTest, PolicySubstitutePort) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(PolicySubstitutePort) {
|
| - InitializeXPCIfRequired();
|
| -
|
| mach_port_t port = MACH_PORT_NULL;
|
| kern_return_t kr = bootstrap_look_up(bootstrap_port, kTestServer, &port);
|
| CHECK_EQ(KERN_SUCCESS, kr);
|
| @@ -409,8 +396,6 @@ TEST_F(BootstrapSandboxTest, DefaultRuleAllow) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(DefaultRuleAllow) {
|
| - InitializeXPCIfRequired();
|
| -
|
| [[NSDistributedNotificationCenter defaultCenter]
|
| postNotificationName:kTestNotification
|
| object:[NSString stringWithFormat:@"%d", getpid()]];
|
| @@ -492,8 +477,6 @@ TEST_F(BootstrapSandboxTest, ChildOutliveSandbox) {
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(ChildOutliveSandbox) {
|
| - InitializeXPCIfRequired();
|
| -
|
| // Get the synchronization channel.
|
| mach_port_t port = MACH_PORT_NULL;
|
| CHECK_EQ(KERN_SUCCESS, bootstrap_look_up(bootstrap_port, "sync", &port));
|
|
|