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) { |