Removed static variable for histograms to avoid race with...

net/base/mime_sniffer.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.
 
 // Detecting mime types is a tricky business because we need to balance
 // compatibility concerns with security issues.  Here is a survey of how other
 // browsers behave and then a description of how we intend to behave.
 //
 // HTML payload, no Content-Type header:
 // * IE 7: Render as HTML
@@ skipping 290 matching lines @@
   *have_enough_content &= TruncateSize(512, &size);
 
   // We adopt a strategy similar to that used by Mozilla to sniff HTML tags,
   // but with some modifications to better match the HTML5 spec.
   const char* const end = content + size;
   const char* pos;
   for (pos = content; pos < end; ++pos) {
     if (!IsAsciiWhitespace(*pos))
       break;
   }
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kSniffableTags2",
                              arraysize(kSniffableTags));
   // |pos| now points to first non-whitespace character (or at end).
   return CheckForMagicNumbers(pos, end - pos,
                               kSniffableTags, arraysize(kSniffableTags),
                               counter.get(), result);
 }
 
 // Returns true and sets result if the content matches any of kMagicNumbers.
 // Clears have_enough_content if more data could possibly change the result.
 static bool SniffForMagicNumbers(const char* content,
                                  size_t size,
                                  bool* have_enough_content,
                                  std::string* result) {
   *have_enough_content &= TruncateSize(kBytesRequiredForMagic, &size);
 
   // Check our big table of Magic Numbers
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kMagicNumbers2",
                              arraysize(kMagicNumbers));
   return CheckForMagicNumbers(content, size,
                               kMagicNumbers, arraysize(kMagicNumbers),
                               counter.get(), result);
 }
 
 // Byte order marks
 static const MagicNumber kMagicXML[] = {
   // We want to be very conservative in interpreting text/xml content as
@@ skipping 20 matching lines @@
                      std::string* result) {
   // We allow at most 300 bytes of content before we expect the opening tag.
   *have_enough_content &= TruncateSize(300, &size);
   const char* pos = content;
   const char* const end = content + size;
 
   // This loop iterates through tag-looking offsets in the file.
   // We want to skip XML processing instructions (of the form "<?xml ...")
   // and stop at the first "plain" tag, then make a decision on the mime-type
   // based on the name (or possibly attributes) of that tag.
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kMagicXML2",
                              arraysize(kMagicXML));
   const int kMaxTagIterations = 5;
   for (int i = 0; i < kMaxTagIterations && pos < end; ++i) {
     pos = reinterpret_cast<const char*>(memchr(pos, '<', end - pos));
     if (!pos)
       return false;
 
     if (base::strncasecmp(pos, "<?xml", sizeof("<?xml")-1) == 0) {
       // Skip XML declarations.
@@ skipping 63 matching lines @@
   // There is no concensus about exactly how to sniff for binary content.
   // * IE 7: Don't sniff for binary looking bytes, but trust the file extension.
   // * Firefox 3.5: Sniff first 4096 bytes for a binary looking byte.
   // Here, we side with FF, but with a smaller buffer. This size was chosen
   // because it is small enough to comfortably fit into a single packet (after
   // allowing for headers) and yet large enough to account for binary formats
   // that have a significant amount of ASCII at the beginning (crbug.com/15314).
   const bool is_truncated = TruncateSize(kMaxBytesToSniff, &size);
 
   // First, we look for a BOM.
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kByteOrderMark2",
                              arraysize(kByteOrderMark));
   std::string unused;
   if (CheckForMagicNumbers(content, size,
                            kByteOrderMark, arraysize(kByteOrderMark),
                            counter.get(), &unused)) {
     // If there is BOM, we think the buffer is not binary.
     result->assign("text/plain");
     return false;
   }
@@ skipping 21 matching lines @@
   static const char* kUnknownMimeTypes[] = {
     // Empty mime types are as unknown as they get.
     "",
     // The unknown/unknown type is popular and uninformative
     "unknown/unknown",
     // The second most popular unknown mime type is application/unknown
     "application/unknown",
     // Firefox rejects a mime type if it is exactly */*
     "*/*",
   };
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kUnknownMimeTypes2",
                              arraysize(kUnknownMimeTypes) + 1);
   for (size_t i = 0; i < arraysize(kUnknownMimeTypes); ++i) {
     if (mime_type == kUnknownMimeTypes[i]) {
       counter->Add(i);
       return true;
     }
   }
   if (mime_type.find('/') == std::string::npos) {
     // Firefox rejects a mime type if it does not contain a slash
     counter->Add(arraysize(kUnknownMimeTypes));
     return true;
   }
   return false;
 }
 
 // Returns true and sets result if the content appears to be a crx (chrome
 // extension) file.
 // Clears have_enough_content if more data could possibly change the result.
 static bool SniffCRX(const char* content,
                      size_t size,
                      const GURL& url,
                      const std::string& type_hint,
                      bool* have_enough_content,
                      std::string* result) {
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kSniffCRX", 3);
 
   // Technically, the crx magic number is just Cr24, but the bytes after that
   // are a version number which changes infrequently. Including it in the
   // sniffing gives us less room for error. If the version number ever changes,
   // we can just add an entry to this list.
   //
   // TODO(aa): If we ever have another magic number, we'll want to pass a
   // histogram into CheckForMagicNumbers(), below, to see which one matched.
   static const struct MagicNumber kCRXMagicNumbers[] = {
@@ skipping 17 matching lines @@
                            NULL, result)) {
     counter->Add(2);
   } else {
     return false;
   }
 
   return true;
 }
 
 bool ShouldSniffMimeType(const GURL& url, const std::string& mime_type) {
-  static scoped_refptr<base::Histogram> should_sniff_counter =
+  scoped_refptr<base::Histogram> should_sniff_counter =
       UMASnifferHistogramGet("mime_sniffer.ShouldSniffMimeType2", 3);
   // We are willing to sniff the mime type for HTTP, HTTPS, and FTP
   bool sniffable_scheme = url.is_empty() ||
                           url.SchemeIs("http") ||
                           url.SchemeIs("https") ||
                           url.SchemeIs("ftp") ||
                           url.SchemeIsFile();
   if (!sniffable_scheme) {
     should_sniff_counter->Add(1);
     return false;
   }
 
   static const char* kSniffableTypes[] = {
     // Many web servers are misconfigured to send text/plain for many
     // different types of content.
     "text/plain",
     // We want to sniff application/octet-stream for
     // application/x-chrome-extension, but nothing else.
     "application/octet-stream",
     // XHTML and Atom/RSS feeds are often served as plain xml instead of
     // their more specific mime types.
     "text/xml",
     "application/xml",
   };
-  static scoped_refptr<base::Histogram> counter =
+  scoped_refptr<base::Histogram> counter =
       UMASnifferHistogramGet("mime_sniffer.kSniffableTypes2",
                              arraysize(kSniffableTypes) + 1);
   for (size_t i = 0; i < arraysize(kSniffableTypes); ++i) {
     if (mime_type == kSniffableTypes[i]) {
       counter->Add(i);
       should_sniff_counter->Add(2);
       return true;
     }
   }
   if (IsUnknownMimeType(mime_type)) {
@@ skipping 75 matching lines @@
   // Now we look in our large table of magic numbers to see if we can find
   // anything that matches the content.
   if (SniffForMagicNumbers(content, content_size,
                            &have_enough_content, result))
     return true;  // We've matched a magic number.  No more content needed.
 
   return have_enough_content;
 }
 
 }  // namespace net