Revert "Do not abort redirect responses with unadvertised encoding."

net/http/http_network_transaction.cc

 // Copyright (c) 2012 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/http/http_network_transaction.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 1783 matching lines @@
     FilterSourceStream::ReportContentDecodingFailed(SourceStream::TYPE_INVALID);
     return false;
   }
 
   // When "Accept-Encoding" is not specified, it is parsed as "*".
   // If "*" encoding is advertised, then any encoding should be "accepted".
   // This does not mean, that it will be successfully decoded.
   if (allowed_encodings.find("*") != allowed_encodings.end())
     return true;
 
-  bool result = true;
   for (auto const& encoding : used_encodings) {
     SourceStream::SourceType source_type =
         FilterSourceStream::ParseEncodingType(encoding);
     // We don't reject encodings we are not aware. They just will not decode.
     if (source_type == SourceStream::TYPE_UNKNOWN)
       continue;
     if (allowed_encodings.find(encoding) == allowed_encodings.end()) {
-      FilterSourceStream::ReportContentDecodingFailed(
-          SourceStream::TYPE_REJECTED);
-      result = false;
-      break;
+      FilterSourceStream::ReportContentDecodingFailed(source_type);
+      return false;
     }
   }
-
-  // Temporary workaround for http://crbug.com/714514
-  if (headers->IsRedirect(nullptr)) {
-    UMA_HISTOGRAM_BOOLEAN("Net.RedirectWithUnadvertisedContentEncoding",
-                          !result);
-    return true;
-  }
-
-  return result;
+  return true;
 }
 
 }  // namespace net