Revert 89532 - Not allow compression when requesting multimedia

net/url_request/url_request_unittest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <shlobj.h>
 #include <windows.h>
 #endif
@@ skipping 2827 matching lines @@
       req(test_server_.GetURL("echoheader?Accept-Language"), &d);
   req.set_context(new TestURLRequestContext());
   HttpRequestHeaders headers;
   headers.SetHeader(HttpRequestHeaders::kAcceptLanguage, "ru");
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(std::string("ru"), d.data_received());
 }
 
-// Check that default A-E header is sent.
-TEST_F(URLRequestTestHTTP, DefaultAcceptEncoding) {
-  ASSERT_TRUE(test_server_.Start());
-
-  TestDelegate d;
-  TestURLRequest
-      req(test_server_.GetURL("echoheader?Accept-Encoding"), &d);
-  req.set_context(new TestURLRequestContext());
-  HttpRequestHeaders headers;
-  req.SetExtraRequestHeaders(headers);
-  req.Start();
-  MessageLoop::current()->Run();
-  EXPECT_TRUE(ContainsString(d.data_received(), "gzip"));
-}
-
-// Check that if request overrides the A-E header, the default is not appended.
-// See http://crbug.com/47381
-TEST_F(URLRequestTestHTTP, OverrideAcceptEncoding) {
-  ASSERT_TRUE(test_server_.Start());
-
-  TestDelegate d;
-  TestURLRequest
-      req(test_server_.GetURL("echoheader?Accept-Encoding"), &d);
-  req.set_context(new TestURLRequestContext());
-  HttpRequestHeaders headers;
-  headers.SetHeader(HttpRequestHeaders::kAcceptEncoding, "identity");
-  req.SetExtraRequestHeaders(headers);
-  req.Start();
-  MessageLoop::current()->Run();
-  EXPECT_FALSE(ContainsString(d.data_received(), "gzip"));
-  EXPECT_TRUE(ContainsString(d.data_received(), "identity"));
-}
-
 // Check that default A-C header is sent.
 TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
   ASSERT_TRUE(test_server_.Start());
 
   TestDelegate d;
   TestURLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), &d);
   scoped_refptr<URLRequestContext> context = new TestURLRequestContext;
   context->set_accept_charset("en");
   req.set_context(context);
   req.Start();
@@ skipping 59 matching lines @@
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   // If the net tests are being run with ChromeFrame then we need to allow for
   // the 'chromeframe' suffix which is added to the user agent before the
   // closing parentheses.
   EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true));
 }
 
 }  // namespace net