Move full hash caching logic to v4_get_hash_protocol_manager

components/safe_browsing_db/v4_local_database_manager_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/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/safe_browsing_db/v4_database.h"
 #include "components/safe_browsing_db/v4_local_database_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/platform_test.h"
 
 namespace safe_browsing {
 
 class FakeV4Database : public V4Database {
  public:
   FakeV4Database(const scoped_refptr<base::SequencedTaskRunner>& db_task_runner,
                  std::unique_ptr<StoreMap> store_map,
-                 const MatchedHashPrefixMap& matched_hash_prefix_map)
+                 const StoreAndHashPrefixes& store_and_hash_prefixes)
       : V4Database(db_task_runner, std::move(store_map)),
-        matched_hash_prefix_map_(matched_hash_prefix_map) {}
+        store_and_hash_prefixes_(store_and_hash_prefixes) {}
 
   void GetStoresMatchingFullHash(
       const FullHash& full_hash,
       const base::hash_set<UpdateListIdentifier>& stores_to_look,
-      MatchedHashPrefixMap* matched_hash_prefix_map) override {
-    *matched_hash_prefix_map = matched_hash_prefix_map_;
+      StoreAndHashPrefixes* store_and_hash_prefixes) override {
+    *store_and_hash_prefixes = store_and_hash_prefixes_;
   }
 
  private:
-  const MatchedHashPrefixMap& matched_hash_prefix_map_;
+  const StoreAndHashPrefixes& store_and_hash_prefixes_;
 };
 
 class V4LocalDatabaseManagerTest : public PlatformTest {
  public:
   V4LocalDatabaseManagerTest() : task_runner_(new base::TestSimpleTaskRunner) {}
 
   void SetUp() override {
     PlatformTest::SetUp();
 
     ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
@@ skipping 16 matching lines @@
     PlatformTest::TearDown();
   }
 
   void SetupLocalDatabaseManager() {
     v4_local_database_manager_->StartOnIOThread(NULL, V4ProtocolConfig());
 
     task_runner_->RunPendingTasks();
     base::RunLoop().RunUntilIdle();
   }
 
-  void ReplaceV4Database(const MatchedHashPrefixMap& matched_hash_prefix_map) {
+  void ReplaceV4Database(const StoreAndHashPrefixes& store_and_hash_prefixes) {
     v4_local_database_manager_->v4_database_.reset(new FakeV4Database(
-        task_runner_, base::MakeUnique<StoreMap>(), matched_hash_prefix_map));
+        task_runner_, base::MakeUnique<StoreMap>(), store_and_hash_prefixes));
   }
 
   void ForceDisableLocalDatabaseManager() {
     v4_local_database_manager_->enabled_ = false;
   }
 
   base::ScopedTempDir base_dir_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<V4LocalDatabaseManager> v4_local_database_manager_;
@@ skipping 20 matching lines @@
 }
 
 TEST_F(V4LocalDatabaseManagerTest,
        TestCheckBrowseUrlWithEmptyStoresReturnsNoMatch) {
   // Both the stores are empty right now so CheckBrowseUrl should return true.
   EXPECT_TRUE(v4_local_database_manager_->CheckBrowseUrl(
       GURL("http://example.com/a/"), nullptr));
 }
 
 TEST_F(V4LocalDatabaseManagerTest, TestCheckBrowseUrlWithFakeDbReturnsMatch) {
-  MatchedHashPrefixMap matched_hash_prefix_map;
-  matched_hash_prefix_map[GetUrlMalwareId()] = HashPrefix("aaaa");
-  ReplaceV4Database(matched_hash_prefix_map);
+  net::TestURLFetcherFactory factory;
+
+  StoreAndHashPrefixes store_and_hash_prefixes;
+  store_and_hash_prefixes.push_back(

[Nathan Parker, 2016/09/09 21:26:22]

nit: emplace_back(..,..)
here and below

[vakh (use Gerrit instead), 2016/09/09 23:25:18]

Done.

+      StoreAndHashPrefix(GetUrlMalwareId(), HashPrefix("aaaa")));
+  ReplaceV4Database(store_and_hash_prefixes);
 
   // The fake database returns a matched hash prefix.
   EXPECT_FALSE(v4_local_database_manager_->CheckBrowseUrl(
       GURL("http://example.com/a/"), nullptr));
 }
 
 TEST_F(V4LocalDatabaseManagerTest,
        TestCheckBrowseUrlReturnsNoMatchWhenDisabled) {
-  MatchedHashPrefixMap matched_hash_prefix_map;
-  matched_hash_prefix_map[GetUrlMalwareId()] = HashPrefix("aaaa");
-  ReplaceV4Database(matched_hash_prefix_map);
+  StoreAndHashPrefixes store_and_hash_prefixes;
+  store_and_hash_prefixes.push_back(
+      StoreAndHashPrefix(GetUrlMalwareId(), HashPrefix("aaaa")));
+  ReplaceV4Database(store_and_hash_prefixes);
 
   // The same URL returns |false| in the previous test because
   // v4_local_database_manager_ is enabled.
   ForceDisableLocalDatabaseManager();
 
   EXPECT_TRUE(v4_local_database_manager_->CheckBrowseUrl(
       GURL("http://example.com/a/"), nullptr));
 }
 
 }  // namespace safe_browsing