Port some things in browser/{download,history}, minor things in common....

chrome/browser/safe_browsing/bloom_filter_unittest.cc

Index: chrome/browser/safe_browsing/bloom_filter_unittest.cc
===================================================================
--- chrome/browser/safe_browsing/bloom_filter_unittest.cc	(revision 2786)
+++ chrome/browser/safe_browsing/bloom_filter_unittest.cc	(working copy)
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
-#include "base/win_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -24,19 +23,15 @@
 }
 
 TEST(SafeBrowsing, BloomFilter) {
-  // rand_util isn't random enough on Win2K, see bug 1076619.
-  if (win_util::GetWinVersion() == win_util::WINVERSION_2000)
-    return;
-
   // Use a small number for unit test so it's not slow.
-  int count = 1000;//100000;
+  uint32 count = 1000;  // 100000;
 
   // Build up the bloom filter.
   BloomFilter filter(count * 10);
 
   typedef std::set<int> Values;
   Values values;
-  for (int i = 0; i < count; ++i) {
+  for (uint32 i = 0; i < count; ++i) {
     uint32 value = GenHash();
     values.insert(value);
     filter.Insert(value);