Revert 203400 "Add a killswitch for CSD malware IP match and rep..."

trunk/src/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 "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 1349 matching lines @@
       GURL(std::string("http://good3.com/a/b/c/d/e/f/g/"))));
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedUrl(
       GURL(std::string("http://a.b.good3.com/"))));
 
   EXPECT_FALSE(database_->ContainsDownloadWhitelistedString("asdf"));
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedString(kGoodString));
 
   EXPECT_FALSE(database_->ContainsDownloadWhitelistedUrl(
       GURL(std::string("http://www.google.com/"))));
 
-  // Test only add the malware IP killswitch
-  csd_chunks.clear();
-  chunk.hosts.clear();
-  InsertAddChunkHostFullHashes(
-      &chunk, 15, "sb-ssl.google.com/",
-      "sb-ssl.google.com/safebrowsing/csd/killswitch_malware");
-  csd_chunks.push_back(chunk);
-  EXPECT_TRUE(database_->UpdateStarted(&lists));
-  database_->InsertChunks(safe_browsing_util::kCsdWhiteList, csd_chunks);
-  database_->UpdateFinished(true);
-
-  EXPECT_TRUE(database_->MalwareIPMatchKillSwitchOn());
-
   // Test that the kill-switch works as intended.
   csd_chunks.clear();
   download_chunks.clear();
   lists.clear();
   chunk.hosts.clear();
   InsertAddChunkHostFullHashes(&chunk, 5, "sb-ssl.google.com/",
                                "sb-ssl.google.com/safebrowsing/csd/killswitch");
   csd_chunks.push_back(chunk);
+
   chunk.hosts.clear();
   InsertAddChunkHostFullHashes(&chunk, 5, "sb-ssl.google.com/",
                                "sb-ssl.google.com/safebrowsing/csd/killswitch");
   download_chunks.push_back(chunk);
 
   EXPECT_TRUE(database_->UpdateStarted(&lists));
   database_->InsertChunks(safe_browsing_util::kCsdWhiteList, csd_chunks);
   database_->InsertChunks(safe_browsing_util::kDownloadWhiteList,
                           download_chunks);
   database_->UpdateFinished(true);
 
-  EXPECT_TRUE(database_->MalwareIPMatchKillSwitchOn());
   EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("https://") + kGood1Url2 + "/c.html")));
   EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("http://www.google.com/"))));
   EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("http://www.phishing_url.com/"))));
 
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedUrl(
       GURL(std::string("https://") + kGood1Url2 + "/c.html")));
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedUrl(
       GURL(std::string("http://www.google.com/"))));
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedUrl(
       GURL(std::string("http://www.phishing_url.com/"))));
 
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedString("asdf"));
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedString(kGoodString));
 
   // Remove the kill-switch and verify that we can recover.
   csd_chunks.clear();
   download_chunks.clear();
   lists.clear();
   SBChunk sub_chunk;
   InsertSubChunkHostFullHash(&sub_chunk, 1, 5,
                              "sb-ssl.google.com/",
                              "sb-ssl.google.com/safebrowsing/csd/killswitch");
   csd_chunks.push_back(sub_chunk);
 
   sub_chunk.hosts.clear();
-  InsertSubChunkHostFullHash(
-      &sub_chunk, 10, 15, "sb-ssl.google.com/",
-      "sb-ssl.google.com/safebrowsing/csd/killswitch_malware");
-  csd_chunks.push_back(sub_chunk);
-
-  sub_chunk.hosts.clear();
   InsertSubChunkHostFullHash(&sub_chunk, 1, 5,
                              "sb-ssl.google.com/",
                              "sb-ssl.google.com/safebrowsing/csd/killswitch");
   download_chunks.push_back(sub_chunk);
 
   EXPECT_TRUE(database_->UpdateStarted(&lists));
   database_->InsertChunks(safe_browsing_util::kCsdWhiteList, csd_chunks);
   database_->InsertChunks(safe_browsing_util::kDownloadWhiteList,
                           download_chunks);
   database_->UpdateFinished(true);
 
-  EXPECT_FALSE(database_->MalwareIPMatchKillSwitchOn());
   EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("https://") + kGood1Url2 + "/c.html")));
   EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("https://") + kGood2Url1 + "/c/bla")));
   EXPECT_FALSE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("http://www.google.com/"))));
   EXPECT_FALSE(database_->ContainsCsdWhitelistedUrl(
       GURL(std::string("http://www.phishing_url.com/"))));
 
   EXPECT_TRUE(database_->ContainsDownloadWhitelistedUrl(
@@ skipping 223 matching lines @@
   ASSERT_FALSE(file_util::PathExists(filter_file));
   database_.reset(new SafeBrowsingDatabaseNew);
   database_->Init(database_filename_);
   EXPECT_FALSE(database_->ContainsBrowseUrl(
       GURL("http://www.evil.com/malware.html"),
       &matching_list, &prefix_hits, &full_hashes, now));
   EXPECT_FALSE(database_->ContainsBrowseUrl(
       GURL("http://www.good.com/goodware.html"),
       &matching_list, &prefix_hits, &full_hashes, now));
 }