Remove std::set from PrefixSet checking code.

chrome/browser/safe_browsing/safe_browsing_database.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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 210 matching lines @@
   // Memory space for histograms is determined by the max.  ALWAYS ADD
   // NEW VALUES BEFORE THIS ONE.
   PREFIX_SET_EVENT_MAX
 };
 
 void RecordPrefixSetInfo(PrefixSetEvent event_type) {
   UMA_HISTOGRAM_ENUMERATION("SB2.PrefixSetEvent", event_type,
                             PREFIX_SET_EVENT_MAX);
 }
 
-// Verify that |GetPrefixes()| returns the same set of prefixes as
-// |prefixes|.  This is necessary so that the
+// Generate a |PrefixSet| instance from the contents of
+// |add_prefixes|.  Additionally performs various checks to make sure
+// that the resulting prefix set is valid, so that the
 // PREFIX_SET_EVENT_BLOOM_MISS_PREFIX_HIT_INVALID histogram in
 // ContainsBrowseUrl() can be trustworthy.
-void CheckPrefixSet(const safe_browsing::PrefixSet& prefix_set,
-                    const std::vector<SBPrefix>& prefixes) {
+safe_browsing::PrefixSet* PrefixSetFromAddPrefixes(
+    const std::vector<SBAddPrefix>& add_prefixes) {
+  // TODO(shess): If |add_prefixes| were sorted by the prefix, it
+  // could be passed directly to |PrefixSet()|, removing the need for
+  // |prefixes|.  For now, |prefixes| is useful while debugging
+  // things.
+  std::vector<SBPrefix> prefixes;
+  for (size_t i = 0; i < add_prefixes.size(); ++i) {
+    prefixes.push_back(add_prefixes[i].prefix);
+  }
+
+  std::sort(prefixes.begin(), prefixes.end());
+  prefixes.erase(std::unique(prefixes.begin(), prefixes.end()),
+                 prefixes.end());
+
+  scoped_ptr<safe_browsing::PrefixSet>
+      prefix_set(new safe_browsing::PrefixSet(prefixes));
+
   std::vector<SBPrefix> restored;
-  prefix_set.GetPrefixes(&restored);
-
-  const std::set<SBPrefix> unique(prefixes.begin(), prefixes.end());
+  prefix_set->GetPrefixes(&restored);
 
   // Expect them to be equal.
-  if (restored.size() == unique.size() &&
-      std::equal(unique.begin(), unique.end(), restored.begin()))
-    return;
+  if (restored.size() == prefixes.size() &&
+      std::equal(prefixes.begin(), prefixes.end(), restored.begin()))
+    return prefix_set.release();
 
   // Log BROKEN for continuity with previous release, and SIZE to
   // distinguish which test failed.
   NOTREACHED();
   RecordPrefixSetInfo(PREFIX_SET_GETPREFIXES_BROKEN);
-  if (restored.size() != unique.size())
+  if (restored.size() != prefixes.size())
     RecordPrefixSetInfo(PREFIX_SET_GETPREFIXES_BROKEN_SIZE);
 
   // Try to distinguish between updates from one broken user and a
   // distributed problem.
   static bool logged_broken = false;
   if (!logged_broken) {
     RecordPrefixSetInfo(PREFIX_SET_GETPREFIXES_FIRST_BROKEN);
     logged_broken = true;
   }
 
   // This seems so very very unlikely.  But if it ever were true, then
   // it could explain why GetPrefixes() seemed broken.
   if (sizeof(int) != sizeof(int32))
     RecordPrefixSetInfo(PREFIX_SET_SBPREFIX_WAS_BROKEN);
+
+  return prefix_set.release();
 }
 
 }  // namespace
 
 // The default SafeBrowsingDatabaseFactory.
 class SafeBrowsingDatabaseFactoryImpl : public SafeBrowsingDatabaseFactory {
  public:
   virtual SafeBrowsingDatabase* CreateSafeBrowsingDatabase(
       bool enable_download_protection,
       bool enable_client_side_whitelist) {
@@ skipping 722 matching lines @@
   // Create and populate |filter| from |add_prefixes|.
   // TODO(shess): The bloom filter doesn't need to be a
   // scoped_refptr<> for this code.  Refactor that away.
   const int filter_size =
       BloomFilter::FilterSizeForKeyCount(add_prefixes.size());
   scoped_refptr<BloomFilter> filter(new BloomFilter(filter_size));
   for (size_t i = 0; i < add_prefixes.size(); ++i) {
     filter->Insert(add_prefixes[i].prefix);
   }
 
-  std::vector<SBPrefix> prefixes;
-  for (size_t i = 0; i < add_prefixes.size(); ++i) {
-    prefixes.push_back(add_prefixes[i].prefix);
-  }
-  std::sort(prefixes.begin(), prefixes.end());
   scoped_ptr<safe_browsing::PrefixSet>
-      prefix_set(new safe_browsing::PrefixSet(prefixes));
-
-  CheckPrefixSet(*(prefix_set.get()), prefixes);
+      prefix_set(PrefixSetFromAddPrefixes(add_prefixes));
 
   // This needs to be in sorted order by prefix for efficient access.
   std::sort(add_full_hashes.begin(), add_full_hashes.end(),
             SBAddFullHashPrefixLess);
 
   // Swap in the newly built filter and cache.
   {
     base::AutoLock locked(lookup_lock_);
     full_browse_hashes_.swap(add_full_hashes);
 
@@ skipping 87 matching lines @@
   DVLOG(1) << "SafeBrowsingDatabaseNew read bloom filter in "
            << (base::TimeTicks::Now() - before).InMilliseconds() << " ms";
 
   if (!browse_bloom_filter_.get())
     RecordFailure(FAILURE_DATABASE_FILTER_READ);
 
   // Manually re-generate the prefix set from the main database.
   // TODO(shess): Write/read for prefix set.
   std::vector<SBAddPrefix> add_prefixes;
   browse_store_->GetAddPrefixes(&add_prefixes);
-  std::vector<SBPrefix> prefixes;
-  for (size_t i = 0; i < add_prefixes.size(); ++i) {
-    prefixes.push_back(add_prefixes[i].prefix);
-  }
-  std::sort(prefixes.begin(), prefixes.end());
-  prefix_set_.reset(new safe_browsing::PrefixSet(prefixes));
-  CheckPrefixSet(*(prefix_set_.get()), prefixes);
+  prefix_set_.reset(PrefixSetFromAddPrefixes(add_prefixes));
 }
 
 bool SafeBrowsingDatabaseNew::Delete() {
   DCHECK_EQ(creation_loop_, MessageLoop::current());
 
   const bool r1 = browse_store_->Delete();
   if (!r1)
     RecordFailure(FAILURE_DATABASE_STORE_DELETE);
 
   const bool r2 = download_store_.get() ? download_store_->Delete() : true;
@@ skipping 52 matching lines @@
   if (std::binary_search(new_csd_whitelist.begin(), new_csd_whitelist.end(),
                          kill_switch)) {
     // The kill switch is whitelisted hence we whitelist all URLs.
     CsdWhitelistAllUrls();
   } else {
     base::AutoLock locked(lookup_lock_);
     csd_whitelist_all_urls_ = false;
     csd_whitelist_.swap(new_csd_whitelist);
   }
 }