Revert 48186, 48196, 48198

chrome_frame/test/util_unittests.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 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 "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "chrome_frame/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const wchar_t kChannelName[] = L"-dev";
 const wchar_t kSuffix[] = L"-fix";
 
 TEST(UtilTests, GetModuleVersionTest) {
   HMODULE mod = GetModuleHandle(L"kernel32.dll");
   EXPECT_NE(mod, static_cast<HMODULE>(NULL));
   wchar_t path[MAX_PATH] = {0};
   GetModuleFileName(mod, path, arraysize(path));
 
   // Use the method that goes to disk
   scoped_ptr<FileVersionInfo> base_info(
       FileVersionInfo::CreateFileVersionInfo(path));
   EXPECT_TRUE(base_info.get() != NULL);
 
   // Use the method that doesn't go to disk
   uint32 low = 0, high = 0;
   EXPECT_TRUE(GetModuleVersion(mod, &high, &low));
-  EXPECT_NE(high, 0u);
-  EXPECT_NE(low, 0u);
+  EXPECT_NE(high, 0);
+  EXPECT_NE(low, 0);
 
   // Make sure they give the same results.
   FileVersionInfoWin* base_info_win =
       static_cast<FileVersionInfoWin*>(base_info.get());
   VS_FIXEDFILEINFO* fixed_info = base_info_win->fixed_file_info();
   EXPECT_TRUE(fixed_info != NULL);
 
   EXPECT_EQ(fixed_info->dwFileVersionMS, static_cast<DWORD>(high));
   EXPECT_EQ(fixed_info->dwFileVersionLS, static_cast<DWORD>(low));
 }
@@ skipping 66 matching lines @@
 
   std::wstring str_guid(GuidToString(test_guid));
   EXPECT_EQ(0, str_guid.compare(compare));
   EXPECT_EQ(static_cast<size_t>(lstrlenW(compare)), str_guid.length());
 }
 
 TEST(UtilTests, GetTempInternetFiles) {
   FilePath path = GetIETemporaryFilesFolder();
   EXPECT_FALSE(path.empty());
 }