Adjust histograms to get better data for latency experiments...

net/base/filter.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/base/filter.h"
 
 #include "base/string_util.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/bzip2_filter.h"
 #include "net/base/sdch_filter.h"
@@ skipping 74 matching lines @@
         LowerCaseEqualsASCII(mime_type, kApplicationGzip) ||
         LowerCaseEqualsASCII(mime_type, kApplicationXGunzip))
       // The server has told us that it sent us gziped content with a gzip
       // content encoding.  Sadly, Apache mistakenly sets these headers for all
       // .gz files.  We match Firefox's nsHttpChannel::ProcessNormal and ignore
       // the Content-Encoding here.
       encoding_types->clear();
     return;
   }
 
-  if (!is_sdch_response)
+  if (!is_sdch_response) {
+    if (1 < encoding_types->size()) {
+      // Multiple filters were intended to only be used for SDCH (thus far!)
+      SdchManager::SdchErrorRecovery(
+          SdchManager::MULTIENCODING_FOR_NON_SDCH_REQUEST);
+    }
+    if ((1 == encoding_types->size()) &&
+        (FILTER_TYPE_SDCH == encoding_types->front())) {
+        SdchManager::SdchErrorRecovery(
+            SdchManager::SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST);
+    }
     return;
+  }
 
   // If content encoding included SDCH, then everything is 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())
+    if (1 == encoding_types->size()) {
       encoding_types->push_back(FILTER_TYPE_GZIP_HELPING_SDCH);
+      SdchManager::SdchErrorRecovery(
+          SdchManager::OPTIONAL_GUNZIP_ENCODING_ADDED);
+    }
     return;
   }
 
   // SDCH "search results" protective hack: To make sure we don't break the only
   // currently deployed SDCH enabled server! Be VERY cautious about proxies that
   // strip all content-encoding to not include sdch.  IF we don't see content
   // encodings that seem to match what we'd expect from a server that asked us
   // to use a dictionary (and we advertised said dictionary in the GET), then
   // we set the encoding to (try to) use SDCH to decode.  Note that SDCH will
   // degrade into a pass-through filter if it doesn't have a viable dictionary
@@ skipping 188 matching lines @@
   mime_type_ = mime_type;
   if (next_filter_.get())
     next_filter_->SetMimeType(mime_type);
 }
 
 void Filter::SetConnectTime(const base::Time& time) {
   connect_time_ = time;
   if (next_filter_.get())
     next_filter_->SetConnectTime(time);
 }