Remove bzip2 decoding support completely.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2006-2009 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/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 828 matching lines @@
   EXPECT_TRUE(headers->GetNormalizedHeader("content-type", &header));
   EXPECT_EQ("text/html; charset=ISO-8859-1", header);
 
   // The response has two "X-Multiple-Entries" headers.
   // This verfies our output has them concatenated together.
   header.clear();
   EXPECT_TRUE(headers->GetNormalizedHeader("x-multiple-entries", &header));
   EXPECT_EQ("a, b", header);
 }
 
-// TODO(jar): 14801 Remove BZIP code completely.
-TEST_F(URLRequestTest, DISABLED_BZip2ContentTest) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"net/data/filter_unittests", NULL);
-  ASSERT_TRUE(NULL != server.get());
-
-  // for localhost domain, we also should support bzip2 encoding
-  // first, get the original file
-  TestDelegate d1;
-  TestURLRequest req1(server->TestServerPage("realfiles/google.txt"), &d1);
-  req1.Start();
-  MessageLoop::current()->Run();
-
-  const std::string& got_content = d1.data_received();
-
-  // second, get bzip2 content
-  TestDelegate d2;
-  TestURLRequest req2(server->TestServerPage("realbz2files/google.txt"), &d2);
-  req2.Start();
-  MessageLoop::current()->Run();
-
-  const std::string& got_bz2_content = d2.data_received();
-
-  // compare those two results
-  EXPECT_EQ(got_content, got_bz2_content);
-}
-
-// TODO(jar): 14801 Remove BZIP code completely.
-TEST_F(URLRequestTest, DISABLED_BZip2ContentTest_IncrementalHeader) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"net/data/filter_unittests", NULL);
-  ASSERT_TRUE(NULL != server.get());
-
-  // for localhost domain, we also should support bzip2 encoding
-  // first, get the original file
-  TestDelegate d1;
-  TestURLRequest req1(server->TestServerPage("realfiles/google.txt"), &d1);
-  req1.Start();
-  MessageLoop::current()->Run();
-
-  const std::string& got_content = d1.data_received();
-
-  // second, get bzip2 content.  ask the testserver to send the BZ2 header in
-  // two chunks with a delay between them.  this tests our fix for bug 867161.
-  TestDelegate d2;
-  TestURLRequest req2(server->TestServerPage(
-      "realbz2files/google.txt?incremental-header"), &d2);
-  req2.Start();
-  MessageLoop::current()->Run();
-
-  const std::string& got_bz2_content = d2.data_received();
-
-  // compare those two results
-  EXPECT_EQ(got_content, got_bz2_content);
-}
-
 #if defined(OS_WIN)
 TEST_F(URLRequestTest, ResolveShortcutTest) {
   FilePath app_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &app_path);
   app_path = app_path.AppendASCII("net");
   app_path = app_path.AppendASCII("data");
   app_path = app_path.AppendASCII("url_request_unittest");
   app_path = app_path.AppendASCII("with-headers.html");
 
   std::wstring lnk_path = app_path.value() + L".lnk";
@@ skipping 1306 matching lines @@
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   TestURLRequest
       req(server_->TestServerPage("echoheaderoverride?Accept-Charset"), &d);
   req.set_context(new URLRequestTestContext());
   req.SetExtraRequestHeaders("Accept-Charset: koi-8r");
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(std::string("koi-8r"), d.data_received());
 }