Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2487)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/prefix_set_unittest.cc

Issue 781613002: Make SafeBrowsingDatabase's PrefixSets only updatable by swapping a new one in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a2_threadchecks
Patch Set: rebase off of CL 744183002 Created 6 years 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 | « chrome/browser/safe_browsing/prefix_set.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/prefix_set_unittest.cc
diff --git a/chrome/browser/safe_browsing/prefix_set_unittest.cc b/chrome/browser/safe_browsing/prefix_set_unittest.cc
index dc0be83b17c8a350b51b1592ed0184966d7a5a7d..edae3c9cc3eaaaf753096f8c47178910a0c2945c 100644
--- a/chrome/browser/safe_browsing/prefix_set_unittest.cc
+++ b/chrome/browser/safe_browsing/prefix_set_unittest.cc
@@ -221,7 +221,7 @@ TEST_F(PrefixSetTest, Baseline) {
TEST_F(PrefixSetTest, Empty) {
const std::vector<SBPrefix> empty;
PrefixSetBuilder builder(empty);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
for (size_t i = 0; i < shared_prefixes_.size(); ++i) {
EXPECT_FALSE(prefix_set->PrefixExists(shared_prefixes_[i]));
}
@@ -231,7 +231,7 @@ TEST_F(PrefixSetTest, Empty) {
TEST_F(PrefixSetTest, OneElement) {
const std::vector<SBPrefix> prefixes(100, 0u);
PrefixSetBuilder builder(prefixes);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
EXPECT_FALSE(prefix_set->PrefixExists(static_cast<SBPrefix>(-1)));
EXPECT_TRUE(prefix_set->PrefixExists(prefixes[0]));
EXPECT_FALSE(prefix_set->PrefixExists(1u));
@@ -261,7 +261,7 @@ TEST_F(PrefixSetTest, IntMinMax) {
std::sort(prefixes.begin(), prefixes.end());
PrefixSetBuilder builder(prefixes);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
// Check that |GetPrefixes()| returns the same set of prefixes as
// was passed in.
@@ -284,7 +284,7 @@ TEST_F(PrefixSetTest, AllBig) {
std::sort(prefixes.begin(), prefixes.end());
PrefixSetBuilder builder(prefixes);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
// Check that |GetPrefixes()| returns the same set of prefixes as
// was passed in.
@@ -338,7 +338,7 @@ TEST_F(PrefixSetTest, EdgeCases) {
std::sort(prefixes.begin(), prefixes.end());
PrefixSetBuilder builder(prefixes);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSetNoHashes();
// Check that |GetPrefixes()| returns the same set of prefixes as
// was passed in.
@@ -372,7 +372,7 @@ TEST_F(PrefixSetTest, ReadWrite) {
// the prefixes. Leaves the path in |filename|.
{
ASSERT_TRUE(GetPrefixSetFile(&filename));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_TRUE(prefix_set.get());
CheckPrefixes(*prefix_set, shared_prefixes_);
}
@@ -386,7 +386,7 @@ TEST_F(PrefixSetTest, ReadWrite) {
PrefixSetBuilder builder(prefixes);
ASSERT_TRUE(builder.GetPrefixSetNoHashes()->WriteFile(filename));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_TRUE(prefix_set.get());
CheckPrefixes(*prefix_set, prefixes);
}
@@ -397,7 +397,7 @@ TEST_F(PrefixSetTest, ReadWrite) {
PrefixSetBuilder builder(prefixes);
ASSERT_TRUE(builder.GetPrefixSetNoHashes()->WriteFile(filename));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_TRUE(prefix_set.get());
CheckPrefixes(*prefix_set, prefixes);
}
@@ -422,7 +422,7 @@ TEST_F(PrefixSetTest, ReadWrite) {
PrefixSetBuilder builder(prefixes);
ASSERT_TRUE(builder.GetPrefixSet(hashes)->WriteFile(filename));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_TRUE(prefix_set.get());
CheckPrefixes(*prefix_set, prefixes);
@@ -444,7 +444,7 @@ TEST_F(PrefixSetTest, CorruptionHelpers) {
base::ScopedFILE file(base::OpenFile(filename, "r+b"));
IncrementIntAt(file.get(), kPayloadOffset, 1);
file.reset();
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
// Fix up the checksum and it will read successfully (though the
@@ -463,7 +463,7 @@ TEST_F(PrefixSetTest, CorruptionMagic) {
ASSERT_NO_FATAL_FAILURE(
ModifyAndCleanChecksum(filename, kMagicOffset, 1));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -474,7 +474,7 @@ TEST_F(PrefixSetTest, CorruptionVersion) {
ASSERT_NO_FATAL_FAILURE(
ModifyAndCleanChecksum(filename, kVersionOffset, 10));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -485,7 +485,7 @@ TEST_F(PrefixSetTest, CorruptionIndexSize) {
ASSERT_NO_FATAL_FAILURE(
ModifyAndCleanChecksum(filename, kIndexSizeOffset, 1));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -496,7 +496,7 @@ TEST_F(PrefixSetTest, CorruptionDeltasSize) {
ASSERT_NO_FATAL_FAILURE(
ModifyAndCleanChecksum(filename, kDeltasSizeOffset, 1));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -507,7 +507,7 @@ TEST_F(PrefixSetTest, CorruptionFullHashesSize) {
ASSERT_NO_FATAL_FAILURE(
ModifyAndCleanChecksum(filename, kFullHashesSizeOffset, 1));
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -520,7 +520,7 @@ TEST_F(PrefixSetTest, CorruptionPayload) {
base::ScopedFILE file(base::OpenFile(filename, "r+b"));
ASSERT_NO_FATAL_FAILURE(IncrementIntAt(file.get(), 666, 1));
file.reset();
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -535,7 +535,7 @@ TEST_F(PrefixSetTest, CorruptionDigest) {
long digest_offset = static_cast<long>(size_64 - sizeof(base::MD5Digest));
ASSERT_NO_FATAL_FAILURE(IncrementIntAt(file.get(), digest_offset, 1));
file.reset();
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -549,7 +549,7 @@ TEST_F(PrefixSetTest, CorruptionExcess) {
const char buf[] = "im in ur base, killing ur d00dz.";
ASSERT_EQ(strlen(buf), fwrite(buf, 1, strlen(buf), file.get()));
file.reset();
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -591,7 +591,7 @@ TEST_F(PrefixSetTest, SizeTRecovery) {
CleanChecksum(file.get());
file.reset(); // Flush updates.
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -614,7 +614,7 @@ TEST_F(PrefixSetTest, FullHashBuild) {
hashes.push_back(kHash5);
PrefixSetBuilder builder(prefixes);
- scoped_ptr<PrefixSet> prefix_set = builder.GetPrefixSet(hashes);
+ scoped_ptr<const PrefixSet> prefix_set = builder.GetPrefixSet(hashes);
EXPECT_TRUE(prefix_set->Exists(kHash1));
EXPECT_TRUE(prefix_set->Exists(kHash2));
@@ -672,8 +672,7 @@ TEST_F(PrefixSetTest, ReadSigned) {
CleanChecksum(file.get());
file.reset(); // Flush updates.
- scoped_ptr<safe_browsing::PrefixSet>
- prefix_set(safe_browsing::PrefixSet::LoadFile(filename));
+ scoped_ptr<const PrefixSet> prefix_set = PrefixSet::LoadFile(filename);
ASSERT_FALSE(prefix_set.get());
}
@@ -691,7 +690,7 @@ TEST_F(PrefixSetTest, Version2) {
golden_path = golden_path.AppendASCII("SafeBrowsing");
golden_path = golden_path.AppendASCII(kBasename);
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(golden_path);
+ scoped_ptr<const PrefixSet> prefix_set(PrefixSet::LoadFile(golden_path));
ASSERT_FALSE(prefix_set.get());
}
#endif
@@ -710,7 +709,7 @@ TEST_F(PrefixSetTest, Version3) {
golden_path = golden_path.AppendASCII("SafeBrowsing");
golden_path = golden_path.AppendASCII(kBasename);
- scoped_ptr<PrefixSet> prefix_set = PrefixSet::LoadFile(golden_path);
+ scoped_ptr<const PrefixSet> prefix_set(PrefixSet::LoadFile(golden_path));
ASSERT_TRUE(prefix_set.get());
CheckPrefixes(*prefix_set, ref_prefixes);
« no previous file with comments | « chrome/browser/safe_browsing/prefix_set.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698