| Index: net/base/gzip_filter_unittest.cc
|
| diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
|
| index 247e7da4066386f28ee0b6a83862099f6b133e85..8f7a9d7e391cf65daccd3cb81a861b6d3beda4fb 100644
|
| --- a/net/base/gzip_filter_unittest.cc
|
| +++ b/net/base/gzip_filter_unittest.cc
|
| @@ -24,7 +24,6 @@ namespace {
|
|
|
| const int kDefaultBufferSize = 4096;
|
| const int kSmallBufferSize = 128;
|
| -const int kMaxBufferSize = 1048576; // 1048576 == 2^20 == 1 MB
|
|
|
| const char kApplicationOctetStream[] = "application/octet-stream";
|
| const char kApplicationXGzip[] = "application/x-gzip";
|
| @@ -52,6 +51,8 @@ enum EncodeMode {
|
| ENCODE_DEFLATE // Raw deflate.
|
| };
|
|
|
| +} // namespace
|
| +
|
| // These tests use the path service, which uses autoreleased objects on the
|
| // Mac, so this needs to be a PlatformTest.
|
| class GZipUnitTest : public PlatformTest {
|
| @@ -237,7 +238,7 @@ TEST_F(GZipUnitTest, DecodeDeflate) {
|
| // Decode the compressed data with filter
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| memcpy(filter->stream_buffer()->data(), deflate_encode_buffer_,
|
| @@ -258,7 +259,7 @@ TEST_F(GZipUnitTest, DecodeGZip) {
|
| // Decode the compressed data with filter
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_GZIP);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| memcpy(filter->stream_buffer()->data(), gzip_encode_buffer_,
|
| @@ -280,9 +281,10 @@ TEST_F(GZipUnitTest, DecodeGZip) {
|
| TEST_F(GZipUnitTest, DecodeWithSmallBuffer) {
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
|
| - net::MockFilterContext filter_context(kSmallBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| + filter->ResetInputBufferForTest(kSmallBufferSize);
|
| DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
|
| deflate_encode_buffer_, deflate_encode_len_,
|
| kDefaultBufferSize);
|
| @@ -295,9 +297,10 @@ TEST_F(GZipUnitTest, DecodeWithSmallBuffer) {
|
| TEST_F(GZipUnitTest, DecodeWithOneByteBuffer) {
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_GZIP);
|
| - net::MockFilterContext filter_context(1);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| + filter->ResetInputBufferForTest(1);
|
| DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
|
| gzip_encode_buffer_, gzip_encode_len_,
|
| kDefaultBufferSize);
|
| @@ -307,7 +310,7 @@ TEST_F(GZipUnitTest, DecodeWithOneByteBuffer) {
|
| TEST_F(GZipUnitTest, DecodeWithSmallOutputBuffer) {
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
|
| @@ -320,9 +323,10 @@ TEST_F(GZipUnitTest, DecodeWithSmallOutputBuffer) {
|
| TEST_F(GZipUnitTest, DecodeWithOneByteInputAndOutputBuffer) {
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_GZIP);
|
| - net::MockFilterContext filter_context(1);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| + filter->ResetInputBufferForTest(1);
|
| DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
|
| gzip_encode_buffer_, gzip_encode_len_, 1);
|
| }
|
| @@ -339,7 +343,7 @@ TEST_F(GZipUnitTest, DecodeCorruptedData) {
|
| // Decode the corrupted data with filter
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| char corrupt_decode_buffer[kDefaultBufferSize];
|
| @@ -366,7 +370,7 @@ TEST_F(GZipUnitTest, DecodeMissingData) {
|
| // Decode the corrupted data with filter
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| char corrupt_decode_buffer[kDefaultBufferSize];
|
| @@ -390,7 +394,7 @@ TEST_F(GZipUnitTest, DecodeCorruptedHeader) {
|
| // Decode the corrupted data with filter
|
| std::vector<Filter::FilterType> filter_types;
|
| filter_types.push_back(Filter::FILTER_TYPE_GZIP);
|
| - net::MockFilterContext filter_context(kDefaultBufferSize);
|
| + net::MockFilterContext filter_context;
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
| ASSERT_TRUE(filter.get());
|
| char corrupt_decode_buffer[kDefaultBufferSize];
|
| @@ -402,5 +406,3 @@ TEST_F(GZipUnitTest, DecodeCorruptedHeader) {
|
| // Expect failures
|
| EXPECT_TRUE(code == Filter::FILTER_ERROR);
|
| }
|
| -
|
| -} // namespace
|
|
|