Remove the unused OffDomainInclusionDetector

chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

Index: chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 01bba17d283ea1b7589758c084490edabb9ab394..9f249037173c9aebf1bab4b72895d0a9d5033161 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -276,8 +276,6 @@ class SafeBrowsingDatabaseTest : public PlatformTest {
         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 =
@@ -289,10 +287,16 @@ class SafeBrowsingDatabaseTest : public PlatformTest {
     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_);
   }
 
@@ -439,11 +443,6 @@ TEST_F(SafeBrowsingDatabaseTest, ListNames) {
   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,

[Nathan Parker, 2016/05/16 16:40:10]

Go ahead and renumber these, so they're easier to verify visually.

[Joe Mason, 2016/05/16 19:35:12]

Done.

                                          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
                                          "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
@@ -469,7 +468,7 @@ TEST_F(SafeBrowsingDatabaseTest, ListNames) {
   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());
@@ -485,24 +484,21 @@ TEST_F(SafeBrowsingDatabaseTest, ListNames) {
   EXPECT_EQ(kDownloadWhiteList, lists[4].name);
   EXPECT_EQ("6", 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("8", 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("10", 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("11", 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("12", 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("13", 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();
 }
@@ -567,7 +563,7 @@ TEST_F(SafeBrowsingDatabaseTest, BrowseAndUnwantedDatabasesAndPrefixSets) {
     },
     {
       kUnwantedUrlList,
-      8U,
+      7U,
       &SafeBrowsingDatabase::ContainsUnwantedSoftwareUrl,
       &SafeBrowsingDatabase::ContainsUnwantedSoftwareHashes
     },
@@ -1185,8 +1181,7 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
   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.
@@ -1397,8 +1392,6 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) {
       {kDownloadWhiteList,
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedUrl,
        &SafeBrowsingDatabase::ContainsDownloadWhitelistedString},
-      {kInclusionWhitelist,
-       &SafeBrowsingDatabase::ContainsInclusionWhitelistedUrl, nullptr},
       {kModuleWhitelist, nullptr,
        &SafeBrowsingDatabase::ContainsModuleWhitelistedString},
   };
@@ -1406,7 +1399,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) {
   // 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 => ") +