Revert "Sdch view for net-internals"

net/filter/filter.cc

 // Copyright 2014 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.
 
 // The basic usage of the Filter interface is described in the comment at
 // the beginning of filter.h.  If Filter::Factory is passed a vector of
 // size greater than 1, that interface is implemented by a series of filters
 // connected in a chain.  In such a case the first filter
 // in the chain proxies calls to ReadData() so that its return values
 // apply to the entire chain.
@@ skipping 10 matching lines @@
 // next filter needs it, a return value of FILTER_NEED_MORE_DATA from the
 // final filter will apply to the entire chain.
 
 #include "net/filter/filter.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "net/base/filename_util_unsafe.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
-#include "net/base/sdch_net_log_params.h"
 #include "net/filter/gzip_filter.h"
 #include "net/filter/sdch_filter.h"
 #include "net/url_request/url_request_context.h"
 #include "url/gurl.h"
 
-namespace net {
-
 namespace {
 
 // Filter types (using canonical lower case only):
 const char kDeflate[]      = "deflate";
 const char kGZip[]         = "gzip";
 const char kXGZip[]        = "x-gzip";
 const char kSdch[]         = "sdch";
 // compress and x-compress are currently not supported.  If we decide to support
 // them, we'll need the same mime type compatibility hack we have for gzip.  For
 // more information, see Firefox's nsHttpChannel::ProcessNormal.
 
 // Mime types:
 const char kApplicationXGzip[]     = "application/x-gzip";
 const char kApplicationGzip[]      = "application/gzip";
 const char kApplicationXGunzip[]   = "application/x-gunzip";
 const char kTextHtml[]             = "text/html";
 
 // Buffer size allocated when de-compressing data.
 const int kFilterBufSize = 32 * 1024;
 
-void LogSdchProblem(const FilterContext& filter_context,
-                    SdchProblemCode problem) {
-  SdchManager::SdchErrorRecovery(problem);
-  filter_context.GetNetLog().AddEvent(
-      NetLog::TYPE_SDCH_DECODING_ERROR,
-      base::Bind(&NetLogSdchResourceProblemCallback, problem));
-}
+}  // namespace
 
-}  // namespace
+namespace net {
 
 FilterContext::~FilterContext() {
 }
 
 Filter::~Filter() {}
 
 // static
 Filter* Filter::Factory(const std::vector<FilterType>& filter_types,
                         const FilterContext& filter_context) {
   if (filter_types.empty())
@@ skipping 157 matching lines @@
           !IsSupportedMimeType(mime_type))
         encoding_types->clear();
     }
   }
 
   // If the request was for SDCH content, then we might need additional fixups.
   if (!filter_context.SdchResponseExpected()) {
     // It was not an SDCH request, so we'll just record stats.
     if (1 < encoding_types->size()) {
       // Multiple filters were intended to only be used for SDCH (thus far!)
-      LogSdchProblem(filter_context, SDCH_MULTIENCODING_FOR_NON_SDCH_REQUEST);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::MULTIENCODING_FOR_NON_SDCH_REQUEST);
     }
     if ((1 == encoding_types->size()) &&
         (FILTER_TYPE_SDCH == encoding_types->front())) {
-      LogSdchProblem(filter_context,
-                     SDCH_SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST);
+        SdchManager::SdchErrorRecovery(
+            SdchManager::SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST);
     }
     return;
   }
 
   // The request was tagged as an SDCH request, which means the server supplied
   // a dictionary, and we advertised it in the request.  Some proxies will do
   // very strange things to the request, or the response, so we have to handle
   // them gracefully.
 
   // If content encoding included SDCH, then everything is "relatively" fine.
   if (!encoding_types->empty() &&
       (FILTER_TYPE_SDCH == encoding_types->front())) {
     // Some proxies (found currently in Argentina) strip the Content-Encoding
     // text from "sdch,gzip" to a mere "sdch" without modifying the compressed
     // payload.   To handle this gracefully, we simulate the "probably" deleted
     // ",gzip" by appending a tentative gzip decode, which will default to a
     // no-op pass through filter if it doesn't get gzip headers where expected.
     if (1 == encoding_types->size()) {
       encoding_types->push_back(FILTER_TYPE_GZIP_HELPING_SDCH);
-      LogSdchProblem(filter_context, SDCH_OPTIONAL_GUNZIP_ENCODING_ADDED);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::OPTIONAL_GUNZIP_ENCODING_ADDED);
     }
     return;
   }
 
   // There are now several cases to handle for an SDCH request.  Foremost, if
   // the outbound request was stripped so as not to advertise support for
   // encodings, we might get back content with no encoding, or (for example)
   // just gzip.  We have to be sure that any changes we make allow for such
   // minimal coding to work.  That issue is why we use TENTATIVE filters if we
   // add any, as those filters sniff the content, and act as pass-through
@@ skipping 13 matching lines @@
   // The one unresolved failure mode comes when we advertise a dictionary, and
   // the server tries to *send* a gzipped file (not gzip encode content), and
   // then we could do a gzip decode :-(. Since SDCH is only (currently)
   // supported server side on paths that only send HTML content, this mode has
   // never surfaced in the wild (and is unlikely to).
   // We will gather a lot of stats as we perform the fixups
   if (StartsWithASCII(mime_type, kTextHtml, false)) {
     // Suspicious case: Advertised dictionary, but server didn't use sdch, and
     // we're HTML tagged.
     if (encoding_types->empty()) {
-      LogSdchProblem(filter_context, SDCH_ADDED_CONTENT_ENCODING);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::ADDED_CONTENT_ENCODING);
     } else if (1 == encoding_types->size()) {
-      LogSdchProblem(filter_context, SDCH_FIXED_CONTENT_ENCODING);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::FIXED_CONTENT_ENCODING);
     } else {
-      LogSdchProblem(filter_context, SDCH_FIXED_CONTENT_ENCODINGS);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::FIXED_CONTENT_ENCODINGS);
     }
   } else {
     // Remarkable case!?!  We advertised an SDCH dictionary, content-encoding
     // was not marked for SDCH processing: Why did the server suggest an SDCH
     // dictionary in the first place??.  Also, the content isn't
     // tagged as HTML, despite the fact that SDCH encoding is mostly likely for
     // HTML: Did some anti-virus system strip this tag (sometimes they strip
     // accept-encoding headers on the request)??  Does the content encoding not
     // start with "text/html" for some other reason??  We'll report this as a
     // fixup to a binary file, but it probably really is text/html (some how).
     if (encoding_types->empty()) {
-      LogSdchProblem(filter_context, SDCH_BINARY_ADDED_CONTENT_ENCODING);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::BINARY_ADDED_CONTENT_ENCODING);
     } else if (1 == encoding_types->size()) {
-      LogSdchProblem(filter_context, SDCH_BINARY_FIXED_CONTENT_ENCODING);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::BINARY_FIXED_CONTENT_ENCODING);
     } else {
-      LogSdchProblem(filter_context, SDCH_BINARY_FIXED_CONTENT_ENCODINGS);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::BINARY_FIXED_CONTENT_ENCODINGS);
     }
   }
 
   // Leave the existing encoding type to be processed first, and add our
   // tentative decodings to be done afterwards.  Vodaphone UK reportedyl will
   // perform a second layer of gzip encoding atop the server's sdch,gzip
   // encoding, and then claim that the content encoding is a mere gzip.  As a
   // result we'll need (in that case) to do the gunzip, plus our tentative
   // gunzip and tentative SDCH decoding.
   // This approach nicely handles the empty() list as well, and should work with
@@ skipping 89 matching lines @@
 
 void Filter::PushDataIntoNextFilter() {
   IOBuffer* next_buffer = next_filter_->stream_buffer();
   int next_size = next_filter_->stream_buffer_size();
   last_status_ = ReadFilteredData(next_buffer->data(), &next_size);
   if (FILTER_ERROR != last_status_)
     next_filter_->FlushStreamBuffer(next_size);
 }
 
 }  // namespace net