Index: net/filter/filter_unittest.cc |
diff --git a/net/filter/filter_unittest.cc b/net/filter/filter_unittest.cc |
index 506284d65e481dace5bf04dff648efc2deebf690..0f17e0fb4ffecb171ad78763a87744e84edbf40f 100644 |
--- a/net/filter/filter_unittest.cc |
+++ b/net/filter/filter_unittest.cc |
@@ -24,9 +24,6 @@ class PassThroughFilter : public Filter { |
} // namespace |
-class FilterTest : public testing::Test { |
-}; |
- |
TEST(FilterTest, ContentTypeId) { |
// Check for basic translation of Content-Encoding, including case variations. |
EXPECT_EQ(Filter::FILTER_TYPE_DEFLATE, |
@@ -54,7 +51,7 @@ TEST(FilterTest, ContentTypeId) { |
// Check various fixups that modify content encoding lists. |
TEST(FilterTest, ApacheGzip) { |
MockFilterContext filter_context; |
- filter_context.SetSdchResponse(false); |
+ filter_context.SetSdchResponse(NULL); |
// Check that redundant gzip mime type removes only solo gzip encoding. |
const std::string kGzipMime1("application/x-gzip"); |
@@ -100,7 +97,7 @@ TEST(FilterTest, ApacheGzip) { |
TEST(FilterTest, GzipContentDispositionFilename) { |
MockFilterContext filter_context; |
- filter_context.SetSdchResponse(false); |
+ filter_context.SetSdchResponse(NULL); |
const std::string kGzipMime("application/x-tar"); |
const std::string kContentDisposition("attachment; filename=\"foo.tgz\""); |
@@ -119,7 +116,9 @@ TEST(FilterTest, SdchEncoding) { |
// Handle content encodings including SDCH. |
const std::string kTextHtmlMime("text/html"); |
MockFilterContext filter_context; |
- filter_context.SetSdchResponse(true); |
+ // Empty handle indicates to filter that SDCH is active. |
+ filter_context.SetSdchResponse( |
+ SdchManager::CreateNullDictionarySetForTesting().Pass()); |
std::vector<Filter::FilterType> encoding_types; |
@@ -156,7 +155,8 @@ TEST(FilterTest, MissingSdchEncoding) { |
// Handle interesting case where entire SDCH encoding assertion "got lost." |
const std::string kTextHtmlMime("text/html"); |
MockFilterContext filter_context; |
- filter_context.SetSdchResponse(true); |
+ filter_context.SetSdchResponse( |
+ SdchManager::CreateNullDictionarySetForTesting().Pass()); |
std::vector<Filter::FilterType> encoding_types; |