Revert of PVer4: Keep track of the smallest hashes not their sizes. Replace counters with iterators.

components/safe_browsing_db/v4_store_unittest.cc

 // Copyright 2016 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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
@@ skipping 159 matching lines @@
   prefix_size = 4;
   EXPECT_EQ(APPLY_UPDATE_SUCCESS,
             V4Store::AddUnlumpedHashes(prefix_size, "abcde5432100000-----",
                                        &prefix_map));
   EXPECT_EQ(2u, prefix_map.size());
   hash_prefixes = prefix_map.at(prefix_size);
   EXPECT_EQ(5 * prefix_size, hash_prefixes.size());
   EXPECT_EQ("abcde5432100000-----", hash_prefixes);
 }
 
-TEST_F(V4StoreTest, TestGetNextSmallestUnmergedPrefixWithEmptyPrefixMap) {
+TEST_F(V4StoreTest, TestGetNextSmallestPrefixSizeWithEmptyPrefixMap) {
   HashPrefixMap prefix_map;
-  IteratorMap iterator_map;
-  V4Store::InitializeIteratorMap(prefix_map, &iterator_map);
+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
 
-  HashPrefix prefix;
-  EXPECT_FALSE(V4Store::GetNextSmallestUnmergedPrefix(prefix_map, iterator_map,
-                                                      &prefix));
+  PrefixSize prefix_size;
+  EXPECT_FALSE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                  &prefix_size));
 }
 
-TEST_F(V4StoreTest, TestGetNextSmallestUnmergedPrefix) {
+TEST_F(V4StoreTest, TestGetNextSmallestPrefixSize) {
   HashPrefixMap prefix_map;
   EXPECT_EQ(APPLY_UPDATE_SUCCESS,
             V4Store::AddUnlumpedHashes(5, "-----0000054321abcde", &prefix_map));
   EXPECT_EQ(APPLY_UPDATE_SUCCESS,
-            V4Store::AddUnlumpedHashes(4, "*****0000054321abcde", &prefix_map));
-  IteratorMap iterator_map;
-  V4Store::InitializeIteratorMap(prefix_map, &iterator_map);
+            V4Store::AddUnlumpedHashes(4, "-----0000054321abcde", &prefix_map));
+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
 
-  HashPrefix prefix;
-  EXPECT_TRUE(V4Store::GetNextSmallestUnmergedPrefix(prefix_map, iterator_map,
-                                                     &prefix));
-  EXPECT_EQ("****", prefix);
+  PrefixSize prefix_size;
+  EXPECT_TRUE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                 &prefix_size));
+  EXPECT_EQ(4u, prefix_size);
+}
+
+TEST_F(V4StoreTest, TestGetNextUnmergedPrefix) {
+  HashPrefixMap prefix_map;
+  EXPECT_EQ(APPLY_UPDATE_SUCCESS,
+            V4Store::AddUnlumpedHashes(5, "-----0000054321abcde", &prefix_map));
+  EXPECT_EQ(APPLY_UPDATE_SUCCESS,
+            V4Store::AddUnlumpedHashes(4, "-----0000054321abcde", &prefix_map));
+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
+
+  PrefixSize prefix_size;
+  EXPECT_TRUE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                 &prefix_size));
+  const HashPrefix& prefix = V4Store::GetNextUnmergedPrefixForSize(
+      prefix_size, prefix_map, counter_map);
+  EXPECT_EQ("----", prefix);
 }
 
 TEST_F(V4StoreTest, TestMergeUpdatesWithSameSizesInEachMap) {
   HashPrefixMap prefix_map_old;
   EXPECT_EQ(APPLY_UPDATE_SUCCESS,
             V4Store::AddUnlumpedHashes(4, "abcdefgh", &prefix_map_old));
   EXPECT_EQ(APPLY_UPDATE_SUCCESS,
             V4Store::AddUnlumpedHashes(5, "54321abcde", &prefix_map_old));
   HashPrefixMap prefix_map_additions;
   EXPECT_EQ(
@@ skipping 152 matching lines @@
   EXPECT_EQ(WRITE_SUCCESS,
             V4Store(task_runner_, store_path_).WriteToDisk(std::move(lur)));
 
   V4Store read_store(task_runner_, store_path_);
   EXPECT_EQ(HASH_PREFIX_MAP_GENERATION_FAILURE, read_store.ReadFromDisk());
   EXPECT_TRUE(read_store.state_.empty());
   EXPECT_TRUE(read_store.hash_prefix_map_.empty());
 }
 
 }  // namespace safe_browsing