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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move
Patch Set: Other minor fixes incl. using "using safe_browsing::ClassName" instead of safe_browsing::ClassName everywhere. Created 5 years, 1 month 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
« chrome/browser/safe_browsing/safe_browsing_store_file.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_store_file.cc ('k') | chrome/browser/safe_browsing/safe_browsing_store_unittest.cc » ('j') | chrome/browser/safe_browsing/safe_browsing_store_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
index 91e6fb3e92d8ecad562d3f834375b4602dc6ca32..5cf78273be0b881a653f39f96ed951344b58de41 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
@@ -17,7 +17,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
-namespace {
+namespace safe_browsing {
const int kAddChunk1 = 1;
const int kAddChunk2 = 3;
@@ -27,20 +27,16 @@ const int kAddChunk4 = 7;
const int kSubChunk1 = 2;
const int kSubChunk2 = 4;
-const SBFullHash kHash1 = safe_browsing::SBFullHashForString("one");
-const SBFullHash kHash2 = safe_browsing::SBFullHashForString("two");
-const SBFullHash kHash3 = safe_browsing::SBFullHashForString("three");
-const SBFullHash kHash4 = safe_browsing::SBFullHashForString("four");
-const SBFullHash kHash5 = safe_browsing::SBFullHashForString("five");
-const SBFullHash kHash6 = safe_browsing::SBFullHashForString("six");
+const SBFullHash kHash1 = SBFullHashForString("one");
+const SBFullHash kHash2 = SBFullHashForString("two");
+const SBFullHash kHash3 = SBFullHashForString("three");
+const SBFullHash kHash4 = SBFullHashForString("four");
+const SBFullHash kHash5 = SBFullHashForString("five");
+const SBFullHash kHash6 = SBFullHashForString("six");
const SBPrefix kMinSBPrefix = 0u;
const SBPrefix kMaxSBPrefix = ~kMinSBPrefix;
-} // namespace
mattm 2015/11/11 01:10:16 Keep the anon namespace inside the new namespace.
vakh (old account. dont use) 2015/11/11 18:59:53 Done.
-
-namespace safe_browsing {
-
class SafeBrowsingStoreFileTest : public PlatformTest {
public:
SafeBrowsingStoreFileTest()
@@ -102,7 +98,7 @@ class SafeBrowsingStoreFileTest : public PlatformTest {
EXPECT_FALSE(store_->CheckSubChunk(kAddChunk1));
EXPECT_FALSE(store_->CheckSubChunk(kAddChunk2));
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -144,7 +140,7 @@ TEST_F(SafeBrowsingStoreFileTest, Empty) {
EXPECT_FALSE(store_->CheckSubChunk(1));
EXPECT_FALSE(store_->CheckSubChunk(-1));
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -182,7 +178,7 @@ TEST_F(SafeBrowsingStoreFileTest, BasicStore) {
// Still has the chunks expected in the next update.
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -195,7 +191,7 @@ TEST_F(SafeBrowsingStoreFileTest, BasicStore) {
ASSERT_EQ(1U, add_full_hashes_result.size());
EXPECT_EQ(kAddChunk2, add_full_hashes_result[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(
+ EXPECT_TRUE(SBFullHashEqual(
kHash4, add_full_hashes_result[0].full_hash));
}
}
@@ -213,7 +209,7 @@ TEST_F(SafeBrowsingStoreFileTest, PrefixMinMax) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -235,7 +231,7 @@ TEST_F(SafeBrowsingStoreFileTest, PrefixMinMax) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -269,7 +265,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -281,7 +277,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
ASSERT_EQ(1U, add_full_hashes_result.size());
EXPECT_EQ(kAddChunk2, add_full_hashes_result[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(
+ EXPECT_TRUE(SBFullHashEqual(
kHash4, add_full_hashes_result[0].full_hash));
}
@@ -294,7 +290,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -305,7 +301,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
ASSERT_EQ(1U, add_full_hashes_result.size());
EXPECT_EQ(kAddChunk2, add_full_hashes_result[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(
+ EXPECT_TRUE(SBFullHashEqual(
kHash4, add_full_hashes_result[0].full_hash));
}
@@ -318,7 +314,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -330,7 +326,7 @@ TEST_F(SafeBrowsingStoreFileTest, SubKnockout) {
ASSERT_EQ(1U, add_full_hashes_result.size());
EXPECT_EQ(kAddChunk2, add_full_hashes_result[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(
+ EXPECT_TRUE(SBFullHashEqual(
kHash4, add_full_hashes_result[0].full_hash));
}
}
@@ -386,7 +382,7 @@ TEST_F(SafeBrowsingStoreFileTest, DeleteChunks) {
EXPECT_TRUE(store_->CheckSubChunk(kSubChunk2));
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -397,7 +393,7 @@ TEST_F(SafeBrowsingStoreFileTest, DeleteChunks) {
ASSERT_EQ(1U, add_full_hashes_result.size());
EXPECT_EQ(kAddChunk3, add_full_hashes_result[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(
+ EXPECT_TRUE(SBFullHashEqual(
kHash6, add_full_hashes_result[0].full_hash));
}
@@ -415,7 +411,7 @@ TEST_F(SafeBrowsingStoreFileTest, DeleteChunks) {
store_->DeleteSubChunk(kSubChunk2);
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -434,7 +430,7 @@ TEST_F(SafeBrowsingStoreFileTest, DeleteChunks) {
EXPECT_FALSE(store_->CheckSubChunk(kSubChunk2));
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -493,7 +489,7 @@ TEST_F(SafeBrowsingStoreFileTest, DetectsCorruption) {
{
std::vector<SBPrefix> orig_prefixes;
std::vector<SBAddFullHash> orig_hashes;
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
ASSERT_TRUE(store_->BeginUpdate());
EXPECT_TRUE(store_->FinishUpdate(&builder, &orig_hashes));
builder.GetPrefixSetNoHashes()->GetPrefixes(&orig_prefixes);
@@ -518,7 +514,7 @@ TEST_F(SafeBrowsingStoreFileTest, DetectsCorruption) {
std::vector<SBAddFullHash> add_hashes;
corruption_detected_ = false;
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
ASSERT_TRUE(store_->BeginUpdate());
EXPECT_FALSE(store_->FinishUpdate(&builder, &add_hashes));
EXPECT_TRUE(corruption_detected_);
@@ -655,7 +651,7 @@ TEST_F(SafeBrowsingStoreFileTest, GetAddPrefixesAndHashes) {
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(kSubChunk1, chunks[0]);
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -671,7 +667,7 @@ TEST_F(SafeBrowsingStoreFileTest, GetAddPrefixesAndHashes) {
EXPECT_TRUE(store_->GetAddFullHashes(&add_hashes));
ASSERT_EQ(1U, add_hashes.size());
EXPECT_EQ(kAddChunk2, add_hashes[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash4, add_hashes[0].full_hash));
+ EXPECT_TRUE(SBFullHashEqual(kHash4, add_hashes[0].full_hash));
}
// Test that the database handles resharding correctly, both when growing and
@@ -702,7 +698,7 @@ TEST_F(SafeBrowsingStoreFileTest, Resharding) {
}
EXPECT_TRUE(store_->FinishChunk());
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -729,7 +725,7 @@ TEST_F(SafeBrowsingStoreFileTest, Resharding) {
EXPECT_FALSE(store_->CheckAddChunk(chunk_id + 1));
store_->DeleteAddChunk(chunk_id);
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
@@ -813,7 +809,7 @@ TEST_F(SafeBrowsingStoreFileTest, Version8) {
EXPECT_TRUE(store_->GetAddFullHashes(&add_hashes));
ASSERT_EQ(1U, add_hashes.size());
EXPECT_EQ(kAddChunk1, add_hashes[0].chunk_id);
- EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash2, add_hashes[0].full_hash));
+ EXPECT_TRUE(SBFullHashEqual(kHash2, add_hashes[0].full_hash));
// Attempt an update to make sure things work end-to-end.
EXPECT_TRUE(store_->BeginUpdate());
@@ -841,7 +837,7 @@ TEST_F(SafeBrowsingStoreFileTest, Version8) {
EXPECT_TRUE(store_->FinishChunk());
{
- safe_browsing::PrefixSetBuilder builder;
+ PrefixSetBuilder builder;
std::vector<SBAddFullHash> add_full_hashes_result;
EXPECT_TRUE(store_->FinishUpdate(&builder, &add_full_hashes_result));
« chrome/browser/safe_browsing/safe_browsing_store_file.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_store_file.cc ('k') | chrome/browser/safe_browsing/safe_browsing_store_unittest.cc » ('j') | chrome/browser/safe_browsing/safe_browsing_store_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698