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

sandbox/win/src/interception_unittest.cc

 // Copyright (c) 2011 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.
 
 // This file contains unit tests for InterceptionManager.
 // The tests require private information so the whole interception.cc file is
 // included from this file.
 
 #include <algorithm>
 #include <set>
@@ skipping 100 matching lines @@
     ASSERT_LT(val, kAllocGranularity);
     if (prev_val)
       ASSERT_EQ(val - prev_val, kAlignment);
     if (val)
       min_nonzero_val = std::min(val, min_nonzero_val);
     min_val = std::min(val, min_val);
     prev_val = val;
     max_val = std::max(val, max_val);
   }
   ASSERT_EQ(max_val, kAllocGranularity - kAlignment);
-  ASSERT_EQ(min_val, 0);
+  ASSERT_EQ(0u, min_val);
   ASSERT_EQ(min_nonzero_val, kAlignment);
 }
 
 TEST(InterceptionManagerTest, BufferLayout1) {
   wchar_t exe_name[MAX_PATH];
   ASSERT_NE(0u, GetModuleFileName(NULL, exe_name, MAX_PATH - 1));
 
   TargetProcess *target = MakeTestTargetProcess(::GetCurrentProcess(),
                                                 ::GetModuleHandle(exe_name));
 
@@ skipping 40 matching lines @@
                                       INTERCEPTION_EAT, function, OPEN_KEY_ID);
   interceptions.AddToPatchedFunctions(L"b.dll",
                                       "TheIncredibleCallToSaveTheWorld",
                                       INTERCEPTION_EAT, function, OPEN_KEY_ID);
   interceptions.AddToPatchedFunctions(L"a.dll", "BIsLame",
                                       INTERCEPTION_EAT, function, OPEN_KEY_ID);
   interceptions.AddToPatchedFunctions(L"a.dll", "ARules",
                                       INTERCEPTION_EAT, function, OPEN_KEY_ID);
 
   // Verify that all interceptions were added
-  ASSERT_EQ(18, interceptions.interceptions_.size());
+  ASSERT_EQ(18u, interceptions.interceptions_.size());
 
   size_t buffer_size = interceptions.GetBufferSize();
   scoped_ptr<BYTE[]> local_buffer(new BYTE[buffer_size]);
 
   ASSERT_TRUE(interceptions.SetupConfigBuffer(local_buffer.get(),
                                               buffer_size));
 
   // At this point, the interceptions should have been separated into two
   // groups: one group with the local ("cold") interceptions, consisting of
   // everything from ntdll and stuff set as INTRECEPTION_SERVICE_CALL, and
   // another group with the interceptions belonging to dlls that will be "hot"
   // patched on the client. The second group lives on local_buffer, and the
   // first group remains on the list of interceptions (inside the object
   // "interceptions"). There are 3 local interceptions (of ntdll); the
   // other 15 have to be sent to the child to be performed "hot".
-  EXPECT_EQ(3, interceptions.interceptions_.size());
+  EXPECT_EQ(3u, interceptions.interceptions_.size());
 
   int num_dlls, num_functions, num_names;
   WalkBuffer(local_buffer.get(), buffer_size, &num_dlls, &num_functions,
              &num_names);
 
   // The 15 interceptions on the buffer (to the child) should be grouped on 6
   // dlls. Only four interceptions are using an explicit name for the
   // interceptor function.
   EXPECT_EQ(6, num_dlls);
   EXPECT_EQ(15, num_functions);
@@ skipping 16 matching lines @@
   interceptions.AddToPatchedFunctions(L"ntdll.dll", "NtCreateFile",
                                       INTERCEPTION_SERVICE_CALL, function,
                                       OPEN_FILE_ID);
   interceptions.AddToPatchedFunctions(L"kernel32.dll", "CreateFileEx",
                                       INTERCEPTION_EAT, function, OPEN_FILE_ID);
   interceptions.AddToUnloadModules(L"some02.dll");
   interceptions.AddToPatchedFunctions(L"kernel32.dll", "SomeFileEx",
                                       INTERCEPTION_SMART_SIDESTEP, function,
                                       OPEN_FILE_ID);
   // Verify that all interceptions were added
-  ASSERT_EQ(5, interceptions.interceptions_.size());
+  ASSERT_EQ(5u, interceptions.interceptions_.size());
 
   size_t buffer_size = interceptions.GetBufferSize();
   scoped_ptr<BYTE[]> local_buffer(new BYTE[buffer_size]);
 
   ASSERT_TRUE(interceptions.SetupConfigBuffer(local_buffer.get(),
                                               buffer_size));
 
   // At this point, the interceptions should have been separated into two
   // groups: one group with the local ("cold") interceptions, and another
   // group with the interceptions belonging to dlls that will be "hot"
   // patched on the client. The second group lives on local_buffer, and the
   // first group remains on the list of interceptions, in this case just one.
-  EXPECT_EQ(1, interceptions.interceptions_.size());
+  EXPECT_EQ(1u, interceptions.interceptions_.size());
 
   int num_dlls, num_functions, num_names;
   WalkBuffer(local_buffer.get(), buffer_size, &num_dlls, &num_functions,
              &num_names);
 
   EXPECT_EQ(3, num_dlls);
   EXPECT_EQ(4, num_functions);
   EXPECT_EQ(0, num_names);
 }
 
 }  // namespace sandbox