Index: sandbox/win/src/job_unittest.cc |
diff --git a/sandbox/win/src/job_unittest.cc b/sandbox/win/src/job_unittest.cc |
index 3b2b331046cb8c1c911f28d3d53c24e04bc4aa7f..a1b7acafe3e3364c4ee8c4a47f0006e8be9b30fe 100644 |
--- a/sandbox/win/src/job_unittest.cc |
+++ b/sandbox/win/src/job_unittest.cc |
@@ -16,7 +16,7 @@ TEST(JobTest, TestCreation) { |
{ |
// Create the job. |
Job job; |
- ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0)); |
// check if the job exists. |
HANDLE job_handle = ::OpenJobObjectW(GENERIC_ALL, FALSE, |
@@ -40,7 +40,7 @@ TEST(JobTest, TestDetach) { |
{ |
// Create the job. |
Job job; |
- ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0)); |
job_handle = job.Detach(); |
ASSERT_TRUE(job_handle != NULL); |
@@ -73,7 +73,7 @@ TEST(JobTest, TestExceptions) { |
// Create the job. |
Job job; |
ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", |
- JOB_OBJECT_UILIMIT_READCLIPBOARD)); |
+ JOB_OBJECT_UILIMIT_READCLIPBOARD, 0)); |
job_handle = job.Detach(); |
ASSERT_TRUE(job_handle != NULL); |
@@ -93,7 +93,7 @@ TEST(JobTest, TestExceptions) { |
{ |
// Create the job. |
Job job; |
- ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0)); |
job_handle = job.Detach(); |
ASSERT_TRUE(job_handle != NULL); |
@@ -115,8 +115,8 @@ TEST(JobTest, TestExceptions) { |
TEST(JobTest, DoubleInit) { |
// Create the job. |
Job job; |
- ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0)); |
- ASSERT_EQ(ERROR_ALREADY_INITIALIZED, job.Init(JOB_LOCKDOWN, L"test", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0)); |
+ ASSERT_EQ(ERROR_ALREADY_INITIALIZED, job.Init(JOB_LOCKDOWN, L"test", 0, 0)); |
} |
// Tests the error case when we use a method and the object is not yet |
@@ -131,34 +131,35 @@ TEST(JobTest, NoInit) { |
// Tests the initialization of the job with different security level. |
TEST(JobTest, SecurityLevel) { |
Job job1; |
- ASSERT_EQ(ERROR_SUCCESS, job1.Init(JOB_LOCKDOWN, L"job1", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job1.Init(JOB_LOCKDOWN, L"job1", 0, 0)); |
Job job2; |
- ASSERT_EQ(ERROR_SUCCESS, job2.Init(JOB_RESTRICTED, L"job2", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job2.Init(JOB_RESTRICTED, L"job2", 0, 0)); |
Job job3; |
- ASSERT_EQ(ERROR_SUCCESS, job3.Init(JOB_LIMITED_USER, L"job3", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job3.Init(JOB_LIMITED_USER, L"job3", 0, 0)); |
Job job4; |
- ASSERT_EQ(ERROR_SUCCESS, job4.Init(JOB_INTERACTIVE, L"job4", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job4.Init(JOB_INTERACTIVE, L"job4", 0, 0)); |
Job job5; |
- ASSERT_EQ(ERROR_SUCCESS, job5.Init(JOB_UNPROTECTED, L"job5", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job5.Init(JOB_UNPROTECTED, L"job5", 0, 0)); |
// JOB_NONE means we run without a job object so Init should fail. |
Job job6; |
- ASSERT_EQ(ERROR_BAD_ARGUMENTS, job6.Init(JOB_NONE, L"job6", 0)); |
+ ASSERT_EQ(ERROR_BAD_ARGUMENTS, job6.Init(JOB_NONE, L"job6", 0, 0)); |
Job job7; |
ASSERT_EQ(ERROR_BAD_ARGUMENTS, job7.Init( |
- static_cast<JobLevel>(JOB_NONE+1), L"job7", 0)); |
+ static_cast<JobLevel>(JOB_NONE+1), L"job7", 0, 0)); |
} |
// Tests the method "AssignProcessToJob". |
TEST(JobTest, ProcessInJob) { |
// Create the job. |
Job job; |
- ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_UNPROTECTED, L"job_test_process", 0)); |
+ ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_UNPROTECTED, L"job_test_process", 0, |
+ 0)); |
BOOL result = FALSE; |