trunk/src/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc - Issue 16398002: Revert 203400 "Add a killswitch for CSD malware IP match and rep..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

Issue 16398002: Revert 203400 "Add a killswitch for CSD malware IP match and rep..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/browser/safe_browsing/safe_browsing_database.cc ('k') | trunk/src/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

===================================================================

--- trunk/src/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc (revision 204084)

+++ trunk/src/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc (working copy)

@@ -1367,19 +1367,6 @@

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();

@@ -1388,6 +1375,7 @@

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");

@@ -1399,7 +1387,6 @@

download_chunks);

database_->UpdateFinished(true);

- EXPECT_TRUE(database_->MalwareIPMatchKillSwitchOn());

EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(

GURL(std::string("https://") + kGood1Url2 + "/c.html")));

EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(

@@ -1428,12 +1415,6 @@

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");

@@ -1445,7 +1426,6 @@

download_chunks);

database_->UpdateFinished(true);

- EXPECT_FALSE(database_->MalwareIPMatchKillSwitchOn());

EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(

GURL(std::string("https://") + kGood1Url2 + "/c.html")));

EXPECT_TRUE(database_->ContainsCsdWhitelistedUrl(