Give the filter setup more context so it can figure out whether it's download...

net/base/filter_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/filter.h"
 #include "net/base/filter_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FilterTest : public testing::Test {
 };
@@ skipping 59 matching lines @@
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetMimeType(kGzipMime3);
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   EXPECT_TRUE(encoding_types.empty());
 
   // Check to be sure it doesn't remove everything when it has such a type.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_SDCH);
   filter_context.SetMimeType(kGzipMime1);
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(1U, encoding_types.size());
+  ASSERT_EQ(1U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH, encoding_types.front());
 
   // Check to be sure that gzip can survive with other mime types.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetMimeType("other/mime");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(1U, encoding_types.size());
+  ASSERT_EQ(1U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types.front());
 }
 
 TEST(FilterTest, SdchEncoding) {
   // Handle content encodings including SDCH.
   const std::string kTextHtmlMime("text/html");
   const int kInputBufferSize(100);
   MockFilterContext filter_context(kInputBufferSize);
   filter_context.SetSdchResponse(true);
 
   std::vector<Filter::FilterType> encoding_types;
 
   // Check for most common encoding, and verify it survives unchanged.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_SDCH);
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetMimeType(kTextHtmlMime);
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types[1]);
 
   // Unchanged even with other mime types.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_SDCH);
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetMimeType("other/type");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types[1]);
 
   // Solo SDCH is extended to include optional gunzip.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_SDCH);
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP_HELPING_SDCH, encoding_types[1]);
 }
 
 TEST(FilterTest, MissingSdchEncoding) {
   // Handle interesting case where entire SDCH encoding assertion "got lost."
   const std::string kTextHtmlMime("text/html");
   const int kInputBufferSize(100);
   MockFilterContext filter_context(kInputBufferSize);
   filter_context.SetSdchResponse(true);
 
   std::vector<Filter::FilterType> encoding_types;
 
   // Loss of encoding, but it was an SDCH response with html type.
   encoding_types.clear();
   filter_context.SetMimeType(kTextHtmlMime);
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH_POSSIBLE, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP_HELPING_SDCH, encoding_types[1]);
 
   // Loss of encoding, but it was an SDCH response with a prefix that says it
   // was an html type.  Note that it *should* be the case that a precise match
   // with "text/html" we be collected by GetMimeType() and passed in, but we
   // coded the fixup defensively (scanning for a prefix of "text/html", so this
   // is an example which could survive such confusion in the caller).
   encoding_types.clear();
   filter_context.SetMimeType("text/html; charset=UTF-8");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH_POSSIBLE, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP_HELPING_SDCH, encoding_types[1]);
 
   // No encoding, but it was an SDCH response with non-html type.
   encoding_types.clear();
   filter_context.SetMimeType("other/mime");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
-  EXPECT_EQ(2U, encoding_types.size());
+  ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH_POSSIBLE, encoding_types[0]);
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP_HELPING_SDCH, encoding_types[1]);
 }
+
+TEST(FilterTest, Svgz) {
+  const int kInputBufferSize(100);
+  MockFilterContext filter_context(kInputBufferSize);
+
+  // Check that svgz files are only decompressed when not downloading.
+  const std::string kSvgzMime("image/svg+xml");
+  const std::string kSvgzUrl("http://ignore.com/foo.svgz");
+  const std::string kSvgUrl("http://ignore.com/foo.svg");
+  std::vector<Filter::FilterType> encoding_types;
+
+  // Test svgz extension
+  encoding_types.clear();
+  encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
+  filter_context.SetDownload(false);
+  filter_context.SetMimeType(kSvgzMime);
+  filter_context.SetURL(GURL(kSvgzUrl));
+  Filter::FixupEncodingTypes(filter_context, &encoding_types);
+  ASSERT_EQ(1U, encoding_types.size());
+  EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types.front());
+
+  encoding_types.clear();
+  encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
+  filter_context.SetDownload(true);
+  filter_context.SetMimeType(kSvgzMime);
+  filter_context.SetURL(GURL(kSvgzUrl));
+  Filter::FixupEncodingTypes(filter_context, &encoding_types);
+  EXPECT_TRUE(encoding_types.empty());
+
+  // Test svg extension
+  encoding_types.clear();
+  encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
+  filter_context.SetDownload(false);
+  filter_context.SetMimeType(kSvgzMime);
+  filter_context.SetURL(GURL(kSvgUrl));
+  Filter::FixupEncodingTypes(filter_context, &encoding_types);
+  ASSERT_EQ(1U, encoding_types.size());
+  EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types.front());
+
+  encoding_types.clear();
+  encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
+  filter_context.SetDownload(true);
+  filter_context.SetMimeType(kSvgzMime);
+  filter_context.SetURL(GURL(kSvgUrl));
+  Filter::FixupEncodingTypes(filter_context, &encoding_types);
+  ASSERT_EQ(1U, encoding_types.size());
+  EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types.front());
+}