Cleanup converting safe-browsing chunks to range list.

chrome/browser/safe_browsing/safe_browsing_database.cc

 // Copyright (c) 2010 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 "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/time.h"
@@ skipping 105 matching lines @@
        iter != chunks.end(); ++iter) {
     if (safe_browsing_util::MALWARE == DecodeListId(*iter)) {
       malware_chunks.push_back(DecodeChunkId(*iter));
     } else if (safe_browsing_util::PHISH == DecodeListId(*iter)) {
       phishing_chunks.push_back(DecodeChunkId(*iter));
     } else {
       NOTREACHED();
     }
   }
 
-  std::sort(malware_chunks.begin(), malware_chunks.end());
-  std::vector<ChunkRange> malware_ranges;
-  ChunksToRanges(malware_chunks, &malware_ranges);
-  RangesToString(malware_ranges, malware_list);
-
-  std::sort(phishing_chunks.begin(), phishing_chunks.end());
-  std::vector<ChunkRange> phishing_ranges;
-  ChunksToRanges(phishing_chunks, &phishing_ranges);
-  RangesToString(phishing_ranges, phishing_list);
+  ChunksToRangeString(malware_chunks, malware_list);
+  ChunksToRangeString(phishing_chunks, phishing_list);
 }
 
 // Order |SBAddFullHash| on the prefix part.  |SBAddPrefixLess()| from
 // safe_browsing_store.h orders on both chunk-id and prefix.
 bool SBAddFullHashPrefixLess(const SBAddFullHash& a, const SBAddFullHash& b) {
   return a.full_hash.prefix < b.full_hash.prefix;
 }
 
 }  // namespace
 
@@ skipping 549 matching lines @@
   const base::TimeTicks before = base::TimeTicks::Now();
   const bool write_ok = bloom_filter_->WriteFile(bloom_filter_filename_);
   VLOG(1) << "SafeBrowsingDatabaseNew wrote bloom filter in "
           << (base::TimeTicks::Now() - before).InMilliseconds() << " ms";
 
   if (!write_ok) {
     UMA_HISTOGRAM_COUNTS("SB2.FilterWriteFail", 1);
     RecordFailure(FAILURE_DATABASE_FILTER_WRITE);
   }
 }