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

chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 175 matching lines @@
       GetProcAddress(module_handle, kTestExportName));
   ASSERT_NE(reinterpret_cast<uint8_t*>(NULL), export_addr);
 
   uint8_t new_val = (*export_addr) + 1;
   SIZE_T bytes_written = 0;
   WriteProcessMemory(GetCurrentProcess(),
                      export_addr,
                      reinterpret_cast<void*>(&new_val),
                      1,
                      &bytes_written);
-  ASSERT_EQ(1, bytes_written);
+  ASSERT_EQ(1u, bytes_written);
 
   ClientIncidentReport_EnvironmentData_Process process_report;
   CollectModuleVerificationData(kTestDllNames, kTestDllNamesCount,
                                 &process_report);
 
   // CollectModuleVerificationData should return the single modified module and
   // its modified export.  The other module, being unmodified, is omitted from
   // the returned list of modules.
   // AddressSanitizer build is special though, as it patches the code at
   // startup, which makes every single module modified and introduces extra
@@ skipping 44 matching lines @@
   const wchar_t kDWORDValueName[] = L"DWORDValue";
   const wchar_t kStringData[] = L"string data";
   const DWORD kDWORDData = 0xdeadbeef;
 
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(kStringValueName, kStringData));
 
   registry_data_pb.Clear();
   CollectRegistryData(kRegKeysToCollect, 1, &registry_data_pb);
 
   // Expect 1 registry key, 1 value.
-  EXPECT_EQ(1U, registry_data_pb.size());
+  EXPECT_EQ(1, registry_data_pb.size());
   EXPECT_EQ("HKEY_CURRENT_USER\\Software\\TestKey",
             registry_data_pb.Get(0).name());
-  EXPECT_EQ(1U, registry_data_pb.Get(0).value_size());
+  EXPECT_EQ(1, registry_data_pb.Get(0).value_size());
   EXPECT_EQ(base::WideToUTF8(kStringValueName),
             registry_data_pb.Get(0).value(0).name());
-  EXPECT_EQ(REG_SZ, registry_data_pb.Get(0).value(0).type());
+  EXPECT_EQ(static_cast<uint32_t>(REG_SZ),
+            registry_data_pb.Get(0).value(0).type());
   const char* value_data = registry_data_pb.Get(0).value(0).data().c_str();
   EXPECT_EQ(kStringData,
             std::wstring(reinterpret_cast<const wchar_t*>(&value_data[0])));
 
   // Add another value.
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(kDWORDValueName, kDWORDData));
 
   registry_data_pb.Clear();
   CollectRegistryData(kRegKeysToCollect, 1, &registry_data_pb);
 
   // Expect 1 registry key, 2 values.
-  EXPECT_EQ(1U, registry_data_pb.size());
-  EXPECT_EQ(2U, registry_data_pb.Get(0).value_size());
+  EXPECT_EQ(1, registry_data_pb.size());
+  EXPECT_EQ(2, registry_data_pb.Get(0).value_size());
 
   // Add a subkey.
   const wchar_t kTestValueName[] = L"TestValue";
   const wchar_t kTestData[] = L"test data";
 
   ASSERT_EQ(ERROR_SUCCESS, key.CreateKey(kSubKey, KEY_READ));
   ASSERT_EQ(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, kRootKey, KEY_READ));
   ASSERT_EQ(ERROR_SUCCESS, key.OpenKey(kSubKey, KEY_READ | KEY_SET_VALUE));
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(kTestValueName, kTestData));
   ASSERT_EQ(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, kRootKey, KEY_READ));
 
   registry_data_pb.Clear();
   CollectRegistryData(kRegKeysToCollect, 1, &registry_data_pb);
 
   // Expect 1 subkey, 1 value.
-  EXPECT_EQ(1U, registry_data_pb.Get(0).key_size());
+  EXPECT_EQ(1, registry_data_pb.Get(0).key_size());
   const ClientIncidentReport_EnvironmentData_OS_RegistryKey& subkey_pb =
       registry_data_pb.Get(0).key(0);
   EXPECT_EQ(base::WideToUTF8(kSubKey), subkey_pb.name());
-  EXPECT_EQ(1U, subkey_pb.value_size());
+  EXPECT_EQ(1, subkey_pb.value_size());
   EXPECT_EQ(base::WideToUTF8(kTestValueName), subkey_pb.value(0).name());
   value_data = subkey_pb.value(0).data().c_str();
   EXPECT_EQ(kTestData,
             std::wstring(reinterpret_cast<const wchar_t*>(&value_data[0])));
-  EXPECT_EQ(REG_SZ, subkey_pb.value(0).type());
+  EXPECT_EQ(static_cast<uint32_t>(REG_SZ), subkey_pb.value(0).type());
 }
 
 TEST(SafeBrowsingEnvironmentDataCollectionWinTest,
      CollectDomainEnrollmentData) {
   // The test may or may not be running on a domain-enrolled machine, so all we
   // can check is that some value is filled in.
   ClientIncidentReport_EnvironmentData_OS os_data;
   CollectDomainEnrollmentData(&os_data);
   EXPECT_TRUE(os_data.has_is_enrolled_to_domain());
 }
 
 }  // namespace safe_browsing