clang/win: Let some chromium_code targets build with -Wextra.

sandbox/win/src/job_unittest.cc

Index: sandbox/win/src/job_unittest.cc
diff --git a/sandbox/win/src/job_unittest.cc b/sandbox/win/src/job_unittest.cc
index d1763677996bf13b242f9582d3c4591a51b9138e..7ed9cf0d7e7f5ca2d9de32beccacf557f336e963 100644
--- a/sandbox/win/src/job_unittest.cc
+++ b/sandbox/win/src/job_unittest.cc
@@ -16,7 +16,8 @@ TEST(JobTest, TestCreation) {
   {
     // Create the job.
     Job job;
-    ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
+    ASSERT_EQ(static_cast<DWORD>(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,
@@ -30,7 +31,7 @@ TEST(JobTest, TestCreation) {
   // Check if the job is destroyed when the object goes out of scope.
   HANDLE job_handle = ::OpenJobObjectW(GENERIC_ALL, FALSE, L"my_test_job_name");
   ASSERT_TRUE(job_handle == NULL);
-  ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError());
+  ASSERT_EQ(static_cast<DWORD>(ERROR_FILE_NOT_FOUND), ::GetLastError());
 }
 
 // Tests the method "Take".
@@ -40,7 +41,8 @@ TEST(JobTest, Take) {
   {
     // Create the job.
     Job job;
-    ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
+    ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+              job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
 
     job_handle = job.Take();
     ASSERT_TRUE(job_handle.IsValid());
@@ -61,7 +63,7 @@ TEST(JobTest, Take) {
   // Check if the jbo is really dead.
   job_handle_dup = ::OpenJobObjectW(GENERIC_ALL, FALSE, L"my_test_job_name");
   ASSERT_TRUE(job_handle_dup == NULL);
-  ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError());
+  ASSERT_EQ(static_cast<DWORD>(ERROR_FILE_NOT_FOUND), ::GetLastError());
 }
 
 // Tests the ui exceptions
@@ -71,8 +73,9 @@ 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, 0));
+    ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+              job.Init(JOB_LOCKDOWN, L"my_test_job_name",
+                       JOB_OBJECT_UILIMIT_READCLIPBOARD, 0));
 
     job_handle = job.Take();
     ASSERT_TRUE(job_handle.IsValid());
@@ -84,7 +87,7 @@ TEST(JobTest, TestExceptions) {
                                               &jbur, size, &size);
     ASSERT_TRUE(result);
 
-    ASSERT_EQ(jbur.UIRestrictionsClass & JOB_OBJECT_UILIMIT_READCLIPBOARD, 0);
+    ASSERT_EQ(0u, jbur.UIRestrictionsClass & JOB_OBJECT_UILIMIT_READCLIPBOARD);
     job_handle.Close();
   }
 
@@ -92,7 +95,8 @@ TEST(JobTest, TestExceptions) {
   {
     // Create the job.
     Job job;
-    ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
+    ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+              job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
 
     job_handle = job.Take();
     ASSERT_TRUE(job_handle.IsValid());
@@ -104,8 +108,8 @@ TEST(JobTest, TestExceptions) {
                                               &jbur, size, &size);
     ASSERT_TRUE(result);
 
-    ASSERT_EQ(jbur.UIRestrictionsClass & JOB_OBJECT_UILIMIT_READCLIPBOARD,
-              JOB_OBJECT_UILIMIT_READCLIPBOARD);
+    ASSERT_EQ(static_cast<DWORD>(JOB_OBJECT_UILIMIT_READCLIPBOARD),
+              jbur.UIRestrictionsClass & JOB_OBJECT_UILIMIT_READCLIPBOARD);
   }
 }
 
@@ -113,51 +117,59 @@ 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, 0));
-  ASSERT_EQ(ERROR_ALREADY_INITIALIZED, job.Init(JOB_LOCKDOWN, L"test", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(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
 // initialized.
 TEST(JobTest, NoInit) {
   Job job;
-  ASSERT_EQ(ERROR_NO_DATA, job.UserHandleGrantAccess(NULL));
-  ASSERT_EQ(ERROR_NO_DATA, job.AssignProcessToJob(NULL));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_NO_DATA), job.UserHandleGrantAccess(NULL));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_NO_DATA), job.AssignProcessToJob(NULL));
   ASSERT_FALSE(job.Take().IsValid());
 }
 
 // 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, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job1.Init(JOB_LOCKDOWN, L"job1", 0, 0));
 
   Job job2;
-  ASSERT_EQ(ERROR_SUCCESS, job2.Init(JOB_RESTRICTED, L"job2", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job2.Init(JOB_RESTRICTED, L"job2", 0, 0));
 
   Job job3;
-  ASSERT_EQ(ERROR_SUCCESS, job3.Init(JOB_LIMITED_USER, L"job3", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job3.Init(JOB_LIMITED_USER, L"job3", 0, 0));
 
   Job job4;
-  ASSERT_EQ(ERROR_SUCCESS, job4.Init(JOB_INTERACTIVE, L"job4", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job4.Init(JOB_INTERACTIVE, L"job4", 0, 0));
 
   Job job5;
-  ASSERT_EQ(ERROR_SUCCESS, job5.Init(JOB_UNPROTECTED, L"job5", 0, 0));
+  ASSERT_EQ(static_cast<DWORD>(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, 0));
+  ASSERT_EQ(static_cast<DWORD>(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, 0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_BAD_ARGUMENTS),
+            job7.Init(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,
-                                    0));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job.Init(JOB_UNPROTECTED, L"job_test_process", 0, 0));
 
   BOOL result = FALSE;
 
@@ -168,7 +180,8 @@ TEST(JobTest, ProcessInJob) {
                            &temp_process_info);
   ASSERT_TRUE(result);
   base::win::ScopedProcessInformation pi(temp_process_info);
-  ASSERT_EQ(ERROR_SUCCESS, job.AssignProcessToJob(pi.process_handle()));
+  ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS),
+            job.AssignProcessToJob(pi.process_handle()));
 
   // Get the job handle.
   base::win::ScopedHandle job_handle = job.Take();
@@ -181,8 +194,8 @@ TEST(JobTest, ProcessInJob) {
                                        &jbpidl, size, &size);
   EXPECT_TRUE(result);
 
-  EXPECT_EQ(1, jbpidl.NumberOfAssignedProcesses);
-  EXPECT_EQ(1, jbpidl.NumberOfProcessIdsInList);
+  EXPECT_EQ(1u, jbpidl.NumberOfAssignedProcesses);
+  EXPECT_EQ(1u, jbpidl.NumberOfProcessIdsInList);
   EXPECT_EQ(pi.process_id(), jbpidl.ProcessIdList[0]);
 
   EXPECT_TRUE(::TerminateProcess(pi.process_handle(), 0));