Merge 78809 - Removed static variable for histograms to avoid race withhistogram initialization a...

net/base/mime_sniffer.cc

Index: net/base/mime_sniffer.cc
===================================================================
--- net/base/mime_sniffer.cc	(revision 81175)
+++ net/base/mime_sniffer.cc	(working copy)
@@ -308,7 +308,7 @@
     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).
@@ -326,7 +326,7 @@
   *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,
@@ -367,7 +367,7 @@
   // 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;
@@ -451,7 +451,7 @@
   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;
@@ -493,7 +493,7 @@
     // 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) {
@@ -519,7 +519,7 @@
                      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
@@ -557,7 +557,7 @@
 }
 
 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() ||
@@ -582,7 +582,7 @@
     "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) {