Update monet.

net/base/mime_sniffer.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.
 
 // 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 327 matching lines @@
   // content might not actually have a null terminator.  In that case, we
   // pretend the length is content_size.
   const char* end = static_cast<const char*>(memchr(content, '\0', size));
   const size_t content_strlen =
       (end != NULL) ? static_cast<size_t>(end - content) : size;
 
   bool match = false;
   if (magic_entry.is_string) {
     if (content_strlen >= len) {
       // String comparisons are case-insensitive
-      match = (base::strncasecmp(magic_entry.magic, content, len) == 0);
+      match = (strncasecmp(magic_entry.magic, content, len) == 0);
     }
   } else {
     if (size >= len) {
       if (!magic_entry.mask) {
         match = MagicCmp(magic_entry.magic, content, len);
       } else {
         match = MagicMaskCmp(magic_entry.magic, content, len, magic_entry.mask);
       }
     }
   }
@@ skipping 39 matching lines @@
                          std::string* result) {
   // For HTML, we are willing to consider up to 512 bytes. This may be overly
   // conservative as IE only considers 256.
   *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))
+    if (!base::IsAsciiWhitespace(*pos))
       break;
   }
   static base::HistogramBase* counter(NULL);
   if (!counter) {
     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),
@@ skipping 39 matching lines @@
   OfficeDocType type = DOC_TYPE_NONE;
   for (size_t i = 0; i < arraysize(kOfficeExtensionTypes); ++i) {
     std::string url_path = url.path();
 
     if (url_path.length() < kOfficeExtensionTypes[i].extension_len)
       continue;
 
     const char* extension =
         &url_path[url_path.length() - kOfficeExtensionTypes[i].extension_len];
 
-    if (0 == base::strncasecmp(extension, kOfficeExtensionTypes[i].extension,
-                               kOfficeExtensionTypes[i].extension_len)) {
+    if (0 == strncasecmp(extension, kOfficeExtensionTypes[i].extension,
+                         kOfficeExtensionTypes[i].extension_len)) {
       type = kOfficeExtensionTypes[i].doc_type;
       break;
     }
   }
 
   if (type == DOC_TYPE_NONE)
     return false;
 
   if (office_version == "CFB") {
     switch (type) {
@@ skipping 122 matching lines @@
     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 ((pos + sizeof("<?xml") - 1 <= end) &&
-        (base::strncasecmp(pos, "<?xml", sizeof("<?xml") - 1) == 0)) {
+        (strncasecmp(pos, "<?xml", sizeof("<?xml") - 1) == 0)) {
       // Skip XML declarations.
       ++pos;
       continue;
     } else if ((pos + sizeof("<!DOCTYPE") - 1 <= end) &&
-               (base::strncasecmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE") - 1) ==
-                0)) {
+               (strncasecmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE") - 1) == 0)) {
       // Skip DOCTYPE declarations.
       ++pos;
       continue;
     }
 
     if (CheckForMagicNumbers(pos, end - pos,
                              kMagicXML, arraysize(kMagicXML),
                              counter, result))
       return true;
 
@@ skipping 324 matching lines @@
       ~(1u << '\t' | 1u << '\n' | 1u << '\r' | 1u << '\f' | 1u << '\x1b');
   for (size_t i = 0; i < size; ++i) {
     uint8 byte = static_cast<uint8>(content[i]);
     if (byte < 0x20 && (kBinaryBits & (1u << byte)))
       return true;
   }
   return false;
 }
 
 }  // namespace net