Merge r19173....

net/url_request/url_request_http_job.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/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 535 matching lines @@
 }
 
 void URLRequestHttpJob::AddExtraHeaders() {
   // Supply Accept-Encoding headers first so that it is more likely that they
   // will be in the first transmitted packet.  This can sometimes make it easier
   // to filter and analyze the streams to assure that a proxy has not damaged
   // these headers.  Some proxies deliberately corrupt Accept-Encoding headers.
   if (!SdchManager::Global() ||
       !SdchManager::Global()->IsInSupportedDomain(request_->url())) {
     // Tell the server what compression formats we support (other than SDCH).
-    request_info_.extra_headers += "Accept-Encoding: gzip,deflate,bzip2\r\n";
+    request_info_.extra_headers += "Accept-Encoding: gzip,deflate\r\n";
   } else {
     // Supply SDCH related headers, as well as accepting that encoding.
     // Tell the server what compression formats we support.
     request_info_.extra_headers += "Accept-Encoding: "
-        "gzip,deflate,bzip2,sdch\r\n";
+        "gzip,deflate,sdch\r\n";
 
     // TODO(jar): See if it is worth optimizing away these bytes when the URL is
     // probably an img or such. (and SDCH encoding is not likely).
     std::string avail_dictionaries;
     SdchManager::Global()->GetAvailDictionaryList(request_->url(),
                                                   &avail_dictionaries);
     if (!avail_dictionaries.empty()) {
       request_info_.extra_headers += "Avail-Dictionary: "
           + avail_dictionaries + "\r\n";
       request_info_.load_flags |= net::LOAD_SDCH_DICTIONARY_ADVERTISED;
@@ skipping 34 matching lines @@
   DCHECK(response_info_);
   DCHECK(response_cookies_.empty());
 
   std::string name = "Set-Cookie";
   std::string value;
 
   void* iter = NULL;
   while (response_info_->headers->EnumerateHeader(&iter, name, &value))
     response_cookies_.push_back(value);
 }