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

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

Issue 7823004: Convert SHA256_LENGTH from a constant-in-anonymous-enum to a static const. This defines the cons... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
Index: chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
===================================================================
--- chrome/browser/safe_browsing/client_side_detection_service_unittest.cc (revision 98481)
+++ chrome/browser/safe_browsing/client_side_detection_service_unittest.cc (working copy)
@@ -425,11 +425,11 @@
// Bad subnets are skipped.
ClientSideModel::IPSubnet* subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, '.'));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, '.'));
subnet->set_size(130); // Invalid size.
subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, '.'));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, '.'));
subnet->set_size(-1); // Invalid size.
subnet = model.add_bad_subnet();
@@ -440,19 +440,19 @@
EXPECT_EQ(0U, bad_subnets.size());
subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, '.'));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, '.'));
subnet->set_size(64);
subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, ','));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, ','));
subnet->set_size(64);
subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, '.'));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, '.'));
subnet->set_size(128);
subnet = model.add_bad_subnet();
- subnet->set_prefix(std::string(crypto::SHA256_LENGTH, '.'));
+ subnet->set_prefix(std::string(crypto::kSHA256Length, '.'));
subnet->set_size(100);
ClientSideDetectionService::SetBadSubnets(model, &bad_subnets);
@@ -460,16 +460,16 @@
ClientSideDetectionService::BadSubnetMap::const_iterator it;
std::string mask = std::string(8, '\xFF') + std::string(8, '\x00');
EXPECT_TRUE(bad_subnets.count(mask));
- EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::SHA256_LENGTH, '.')));
- EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::SHA256_LENGTH, ',')));
+ EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, '.')));
+ EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, ',')));
mask = std::string(16, '\xFF');
EXPECT_TRUE(bad_subnets.count(mask));
- EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::SHA256_LENGTH, '.')));
+ EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, '.')));
mask = std::string(12, '\xFF') + "\xF0" + std::string(3, '\x00');
EXPECT_TRUE(bad_subnets.count(mask));
- EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::SHA256_LENGTH, '.')));
+ EXPECT_TRUE(bad_subnets[mask].count(std::string(crypto::kSHA256Length, '.')));
}
TEST_F(ClientSideDetectionServiceTest, IsBadIpAddress) {

Powered by Google App Engine
This is Rietveld 408576698