Reapply r72562 with willchan's nits + locally tested shlib fixes.

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 "net/base/mock_filter_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FilterTest : public testing::Test {
 };
 
 TEST(FilterTest, ContentTypeId) {
   // Check for basic translation of Content-Encoding, including case variations.
   EXPECT_EQ(Filter::FILTER_TYPE_DEFLATE,
             Filter::ConvertEncodingToType("deflate"));
   EXPECT_EQ(Filter::FILTER_TYPE_DEFLATE,
@@ skipping 12 matching lines @@
             Filter::ConvertEncodingToType("sDcH"));
   EXPECT_EQ(Filter::FILTER_TYPE_UNSUPPORTED,
             Filter::ConvertEncodingToType("weird"));
   EXPECT_EQ(Filter::FILTER_TYPE_UNSUPPORTED,
             Filter::ConvertEncodingToType("strange"));
 }
 
 // Check various fixups that modify content encoding lists.
 TEST(FilterTest, ApacheGzip) {
   const int kInputBufferSize(100);
-  MockFilterContext filter_context(kInputBufferSize);
+  net::MockFilterContext filter_context(kInputBufferSize);
   filter_context.SetSdchResponse(false);
 
   // Check that redundant gzip mime type removes only solo gzip encoding.
   const std::string kGzipMime1("application/x-gzip");
   const std::string kGzipMime2("application/gzip");
   const std::string kGzipMime3("application/x-gunzip");
   std::vector<Filter::FilterType> encoding_types;
 
   // First show it removes the gzip, given any gzip style mime type.
   encoding_types.clear();
@@ skipping 28 matching lines @@
   filter_context.SetMimeType("other/mime");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   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);
+  net::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);
@@ skipping 17 matching lines @@
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   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);
+  net::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);
   ASSERT_EQ(2U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_SDCH_POSSIBLE, encoding_types[0]);
@@ skipping 15 matching lines @@
   encoding_types.clear();
   filter_context.SetMimeType("other/mime");
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   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);
+  net::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);
@@ skipping 28 matching lines @@
   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());
 }
 
 TEST(FilterTest, UnsupportedMimeGzip) {
   // From issue 8170 - handling files with Content-Encoding: x-gzip
   const int kInputBufferSize(100);
-  MockFilterContext filter_context(kInputBufferSize);
+  net::MockFilterContext filter_context(kInputBufferSize);
   std::vector<Filter::FilterType> encoding_types;
   const std::string kTarMime("application/x-tar");
   const std::string kCpioMime("application/x-cpio");
   const std::string kTarUrl("http://ignore.com/foo.tar");
   const std::string kTargzUrl("http://ignore.com/foo.tar.gz");
   const std::string kTgzUrl("http://ignore.com/foo.tgz");
   const std::string kBadTgzUrl("http://ignore.com/foo.targz");
   const std::string kUrl("http://ignore.com/foo");
 
   // Firefox 3 does not decompress when we have unsupported mime types for
@@ skipping 67 matching lines @@
   filter_context.SetURL(GURL(kBadTgzUrl));
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   ASSERT_EQ(1U, encoding_types.size());
   EXPECT_EQ(Filter::FILTER_TYPE_GZIP, encoding_types.front());
 }
 
 TEST(FilterTest, SupportedMimeGzip) {
   // From issue 16430 - Files with supported mime types should be decompressed,
   // even though these files end in .gz/.tgz.
   const int kInputBufferSize(100);
-  MockFilterContext filter_context(kInputBufferSize);
+  net::MockFilterContext filter_context(kInputBufferSize);
   std::vector<Filter::FilterType> encoding_types;
   const std::string kGzUrl("http://ignore.com/foo.gz");
   const std::string kUrl("http://ignore.com/foo");
   const std::string kHtmlMime("text/html");
   const std::string kJavascriptMime("text/javascript");
 
   // For files that does not end in .gz/.tgz, we always decompress.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetDownload(false);
@@ skipping 33 matching lines @@
 
   // Except on downloads, where they just get saved.
   encoding_types.clear();
   encoding_types.push_back(Filter::FILTER_TYPE_GZIP);
   filter_context.SetDownload(true);
   filter_context.SetMimeType(kHtmlMime);
   filter_context.SetURL(GURL(kGzUrl));
   Filter::FixupEncodingTypes(filter_context, &encoding_types);
   EXPECT_TRUE(encoding_types.empty());
 }