Remove the unused OffDomainInclusionDetector

chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

 // Copyright (c) 2012 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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 
 #include <stddef.h>
 
@@ skipping 258 matching lines @@
   // stores enabled.
   void ResetAndReloadFullDatabase() {
     SafeBrowsingStoreFile* browse_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* download_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* csd_whitelist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* download_whitelist_store =
         new SafeBrowsingStoreFile(task_runner_);
-    SafeBrowsingStoreFile* inclusion_whitelist_store =
-        new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* extension_blacklist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* ip_blacklist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* unwanted_software_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* module_whitelist_store =
         new SafeBrowsingStoreFile(task_runner_);
     SafeBrowsingStoreFile* resource_blacklist_store =
         new SafeBrowsingStoreFile(task_runner_);
     database_.reset(new SafeBrowsingDatabaseNew(
-        task_runner_, browse_store, download_store, csd_whitelist_store,
-        download_whitelist_store, inclusion_whitelist_store,
-        extension_blacklist_store, ip_blacklist_store, unwanted_software_store,
-        module_whitelist_store, resource_blacklist_store));
+        task_runner_,
+        browse_store,
+        download_store,
+        csd_whitelist_store,
+        download_whitelist_store,
+        extension_blacklist_store,
+        ip_blacklist_store,
+        unwanted_software_store,
+        module_whitelist_store,
+        resource_blacklist_store));
     database_->Init(database_filename_);
   }
 
   bool ContainsDownloadUrl(const std::vector<GURL>& urls,
                            std::vector<SBPrefix>* prefix_hits) {
     std::vector<SBPrefix> prefixes;
     SafeBrowsingDatabase::GetDownloadUrlPrefixes(urls, &prefixes);
     return database_->ContainsDownloadUrlPrefixes(prefixes, prefix_hits);
   }
 
@@ skipping 118 matching lines @@
 
   chunks.clear();
   chunks.push_back(AddChunkPrefixValue(2, "www.foo.com/malware.html"));
   database_->InsertChunks(kPhishingList, chunks);
 
   chunks.clear();
   chunks.push_back(AddChunkPrefixValue(3, "www.whatever.com/download.html"));
   database_->InsertChunks(kBinUrlList, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkFullHashValue(5, "www.forwhitelist.com/a.html"));
+  chunks.push_back(AddChunkFullHashValue(4, "www.forwhitelist.com/a.html"));
   database_->InsertChunks(kCsdWhiteList, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkFullHashValue(6, "www.download.com/"));
+  chunks.push_back(AddChunkFullHashValue(5, "www.download.com/"));
   database_->InsertChunks(kDownloadWhiteList, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkFullHashValue(7, "www.inclusion.com/"));
-  database_->InsertChunks(kInclusionWhitelist,
-                          chunks);
-
-  chunks.clear();
-  chunks.push_back(AddChunkFullHashValue(8,
+  chunks.push_back(AddChunkFullHashValue(6,
                                          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
                                          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   database_->InsertChunks(kExtensionBlacklist,
                           chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkHashedIpValue(10, "::ffff:192.168.1.0", 120));
+  chunks.push_back(AddChunkHashedIpValue(7, "::ffff:192.168.1.0", 120));
   database_->InsertChunks(kIPBlacklist, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkPrefixValue(11, "www.unwanted.com/software.html"));
+  chunks.push_back(AddChunkPrefixValue(8, "www.unwanted.com/software.html"));
   database_->InsertChunks(kUnwantedUrlList, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkPrefixValue(12, "chrome.dll"));
+  chunks.push_back(AddChunkPrefixValue(9, "chrome.dll"));
   database_->InsertChunks(kModuleWhitelist, chunks);
 
   chunks.clear();
-  chunks.push_back(AddChunkPrefixValue(13, "foo.com/script.js"));
+  chunks.push_back(AddChunkPrefixValue(10, "foo.com/script.js"));
   database_->InsertChunks(kResourceBlacklist, chunks);
 
   database_->UpdateFinished(true);
 
   GetListsInfo(&lists);
-  ASSERT_EQ(11U, lists.size());
+  ASSERT_EQ(10U, lists.size());
   EXPECT_EQ(kMalwareList, lists[0].name);
   EXPECT_EQ("1", lists[0].adds);
   EXPECT_TRUE(lists[0].subs.empty());
   EXPECT_EQ(kPhishingList, lists[1].name);
   EXPECT_EQ("2", lists[1].adds);
   EXPECT_TRUE(lists[1].subs.empty());
   EXPECT_EQ(kBinUrlList, lists[2].name);
   EXPECT_EQ("3", lists[2].adds);
   EXPECT_TRUE(lists[2].subs.empty());
   EXPECT_EQ(kCsdWhiteList, lists[3].name);
-  EXPECT_EQ("5", lists[3].adds);
+  EXPECT_EQ("4", lists[3].adds);
   EXPECT_TRUE(lists[3].subs.empty());
   EXPECT_EQ(kDownloadWhiteList, lists[4].name);
-  EXPECT_EQ("6", lists[4].adds);
+  EXPECT_EQ("5", lists[4].adds);
   EXPECT_TRUE(lists[4].subs.empty());
-  EXPECT_EQ(kInclusionWhitelist, lists[5].name);
-  EXPECT_EQ("7", lists[5].adds);
+  EXPECT_EQ(kExtensionBlacklist, lists[5].name);
+  EXPECT_EQ("6", lists[5].adds);
   EXPECT_TRUE(lists[5].subs.empty());
-  EXPECT_EQ(kExtensionBlacklist, lists[6].name);
-  EXPECT_EQ("8", lists[6].adds);
+  EXPECT_EQ(kIPBlacklist, lists[6].name);
+  EXPECT_EQ("7", lists[6].adds);
   EXPECT_TRUE(lists[6].subs.empty());
-  EXPECT_EQ(kIPBlacklist, lists[7].name);
-  EXPECT_EQ("10", lists[7].adds);
+  EXPECT_EQ(kUnwantedUrlList, lists[7].name);
+  EXPECT_EQ("8", lists[7].adds);
   EXPECT_TRUE(lists[7].subs.empty());
-  EXPECT_EQ(kUnwantedUrlList, lists[8].name);
-  EXPECT_EQ("11", lists[8].adds);
+  EXPECT_EQ(kModuleWhitelist, lists[8].name);
+  EXPECT_EQ("9", lists[8].adds);
   EXPECT_TRUE(lists[8].subs.empty());
-  EXPECT_EQ(kModuleWhitelist, lists[9].name);
-  EXPECT_EQ("12", lists[9].adds);
+  EXPECT_EQ(kResourceBlacklist, lists[9].name);
+  EXPECT_EQ("10", lists[9].adds);
   EXPECT_TRUE(lists[9].subs.empty());
-  EXPECT_EQ(kResourceBlacklist, lists[10].name);
-  EXPECT_EQ("13", lists[10].adds);
-  EXPECT_TRUE(lists[10].subs.empty());
 
   database_.reset();
 }
 
 // Checks database reading and writing for browse and unwanted PrefixSets.
 TEST_F(SafeBrowsingDatabaseTest, BrowseAndUnwantedDatabasesAndPrefixSets) {
 
   struct TestCase {
     using TestListContainsBadUrl = bool (SafeBrowsingDatabase::*)(
         const GURL& url,
@@ skipping 44 matching lines @@
       &SafeBrowsingDatabase::ContainsBrowseHashes
     },
     {
       kPhishingList,
       1U,
       &SafeBrowsingDatabase::ContainsBrowseUrl,
       &SafeBrowsingDatabase::ContainsBrowseHashes
     },
     {
       kUnwantedUrlList,
-      8U,
+      7U,
       &SafeBrowsingDatabase::ContainsUnwantedSoftwareUrl,
       &SafeBrowsingDatabase::ContainsUnwantedSoftwareHashes
     },
   };
 
   for (const auto& test_case : kTestCases) {
     SCOPED_TRACE(std::string("Tested list at fault => ") +
                  test_case.test_list_name);
 
     std::vector<SBListChunkRanges> lists;
@@ skipping 597 matching lines @@
 // TODO(shess): Disabled until ScopedLogMessageIgnorer resolved.
 // http://crbug.com/56448
 TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
   // Re-create the database in a captive message loop so that we can
   // influence task-posting.  Database specifically needs to the
   // file-backed.
   database_.reset();
   base::MessageLoop loop;
   SafeBrowsingStoreFile* store = new SafeBrowsingStoreFile(task_runner_);
   database_.reset(new SafeBrowsingDatabaseNew(
-      task_runner_, store, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      NULL));
+      task_runner_, store, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL));
   database_->Init(database_filename_);
 
   // This will cause an empty database to be created.
   std::vector<SBListChunkRanges> lists;
   ASSERT_TRUE(database_->UpdateStarted(&lists));
   database_->UpdateFinished(true);
 
   // Create a sub chunk to insert.
   std::vector<std::unique_ptr<SBChunkData>> chunks;
   chunks.push_back(SubChunkPrefixValue(7,
@@ skipping 190 matching lines @@
     TestListContainsWhitelistedUrl test_list_contains_whitelisted_url;
     // Optional test case field, if set the tested whitelist will also be tested
     // for strings.
     TestListContainsWhitelistedString test_list_contains_whitelisted_string;
   } const kTestCases[]{
       {kCsdWhiteList, &SafeBrowsingDatabase::ContainsCsdWhitelistedUrl,
        nullptr},
       {kDownloadWhiteList,
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedUrl,
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedString},
-      {kInclusionWhitelist,
-       &SafeBrowsingDatabase::ContainsInclusionWhitelistedUrl, nullptr},
       {kModuleWhitelist, nullptr,
        &SafeBrowsingDatabase::ContainsModuleWhitelistedString},
   };
 
   // If the whitelist is disabled everything should match the whitelist.
   database_.reset(new SafeBrowsingDatabaseNew(
       task_runner_, new SafeBrowsingStoreFile(task_runner_), NULL, NULL, NULL,
-      NULL, NULL, NULL, NULL, NULL, NULL));
+      NULL, NULL, NULL, NULL, NULL));
   database_->Init(database_filename_);
   for (const auto& test_case : kTestCases) {
     SCOPED_TRACE(std::string("Tested list at fault => ") +
                  test_case.test_list_name);
 
     if (test_case.TestUrls()) {
       EXPECT_TRUE(
           (database_.get()->*test_case.test_list_contains_whitelisted_url)(
               GURL(std::string("http://www.phishing.com/"))));
     }
@@ skipping 954 matching lines @@
   ASSERT_EQ(1U, prefix_hits.size());
   EXPECT_EQ(SBPrefixForString(kExampleCollision), prefix_hits[0]);
   EXPECT_TRUE(cache_hits.empty());
 
   // This prefix collides, but no full hash match.
   EXPECT_FALSE(database_->ContainsBrowseUrl(
       GURL(std::string("http://") + kExampleFine), &prefix_hits, &cache_hits));
 }
 
 }  // namespace safe_browsing