Index: net/filter/sdch_filter_unittest.cc |
diff --git a/net/filter/sdch_filter_unittest.cc b/net/filter/sdch_filter_unittest.cc |
index 2263001a77a579f09bbb15d417d93da7ddadb8d0..2ef9eb4b8af331d553801fc2941626617e6f1e17 100644 |
--- a/net/filter/sdch_filter_unittest.cc |
+++ b/net/filter/sdch_filter_unittest.cc |
@@ -69,7 +69,7 @@ class SdchFilterTest : public testing::Test { |
const GURL& gurl) { |
std::string list; |
sdch_manager_->GetAvailDictionaryList(gurl, &list); |
- sdch_manager_->AddSdchDictionary(dictionary_text, gurl); |
+ sdch_manager_->AddSdchDictionary(dictionary_text, gurl, BoundNetLog()); |
std::string list2; |
sdch_manager_->GetAvailDictionaryList(gurl, &list2); |
@@ -412,9 +412,11 @@ TEST_F(SdchFilterTest, BasicBadDictionary) { |
EXPECT_EQ(0, output_bytes_or_buffer_size); |
EXPECT_EQ(Filter::FILTER_ERROR, status); |
- EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::DOMAIN_BLACKLIST_INCLUDES_TARGET, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
sdch_manager_->ClearBlacklistings(); |
- EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::PROBLEM_CODE_OK, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
} |
TEST_F(SdchFilterTest, DictionaryAddOnce) { |
@@ -667,10 +669,13 @@ TEST_F(SdchFilterTest, CrossDomainDictionaryUse) { |
filter.get(), &output)); |
EXPECT_EQ(output.size(), 0u); // No output written. |
- EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
- EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(wrong_domain_url)); |
+ EXPECT_EQ(SdchManager::PROBLEM_CODE_OK, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::DOMAIN_BLACKLIST_INCLUDES_TARGET, |
+ sdch_manager_->IsInSupportedDomain(wrong_domain_url)); |
sdch_manager_->ClearBlacklistings(); |
- EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(wrong_domain_url)); |
+ EXPECT_EQ(SdchManager::PROBLEM_CODE_OK, |
+ sdch_manager_->IsInSupportedDomain(wrong_domain_url)); |
} |
TEST_F(SdchFilterTest, DictionaryPathValidation) { |
@@ -723,9 +728,11 @@ TEST_F(SdchFilterTest, DictionaryPathValidation) { |
output_block_size, filter.get(), &output)); |
EXPECT_EQ(output.size(), 0u); // No output written. |
- EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::DOMAIN_BLACKLIST_INCLUDES_TARGET, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
sdch_manager_->ClearBlacklistings(); |
- EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::PROBLEM_CODE_OK, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
} |
TEST_F(SdchFilterTest, DictionaryPortValidation) { |
@@ -789,9 +796,11 @@ TEST_F(SdchFilterTest, DictionaryPortValidation) { |
output_block_size, filter.get(), &output)); |
EXPECT_EQ(output.size(), 0u); // No output written. |
- EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::DOMAIN_BLACKLIST_INCLUDES_TARGET, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
sdch_manager_->ClearBlacklistings(); |
- EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
+ EXPECT_EQ(SdchManager::PROBLEM_CODE_OK, |
+ sdch_manager_->IsInSupportedDomain(GURL(url_string))); |
} |
//------------------------------------------------------------------------------ |