From 6e7930a61a551ca667bc6c20d51d9cda2d0ab0f7 Mon Sep 17 00:00:00 2001
From: "avi@google.com" <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 20 Aug 2008 17:12:05 +0000
Subject: Make mime sniffer compile for Mac.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1092 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/base/mime_sniffer.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'net/base')

diff --git a/net/base/mime_sniffer.cc b/net/base/mime_sniffer.cc
index b5d37dc..0f82674 100644
--- a/net/base/mime_sniffer.cc
+++ b/net/base/mime_sniffer.cc
@@ -120,7 +120,6 @@
 #include "base/basictypes.h"
 #include "base/histogram.h"
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
@@ -312,7 +311,7 @@ static bool MatchMagicNumber(const char* content, size_t size,
   if (magic_entry->is_string) {
     if (content_strlen >= len) {
       // String comparisons are case-insensitive
-      match = (_strnicmp(magic_entry->magic, content, len) == 0);
+      match = (base::strncasecmp(magic_entry->magic, content, len) == 0);
     }
   } else {
     if (size >= len)
@@ -403,11 +402,11 @@ static bool SniffXML(const char* content, size_t size, std::string* result) {
     if (!pos)
       return false;
 
-    if (_strnicmp(pos, "<?xml", sizeof("<?xml")-1) == 0) {
+    if (base::strncasecmp(pos, "<?xml", sizeof("<?xml")-1) == 0) {
       // Skip XML declarations.
       ++pos;
       continue;
-    } else if (_strnicmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE")-1) == 0) {
+    } else if (base::strncasecmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE")-1) == 0) {
       // Skip DOCTYPE declarations.
       ++pos;
       continue;
@@ -498,7 +497,7 @@ static bool IsUnknownMimeType(const std::string& mime_type) {
   };
   static SnifferHistogram counter(L"mime_sniffer.kUnknownMimeTypes",
                                   arraysize(kUnknownMimeTypes) + 1);
-  for (int i = 0; i < arraysize(kUnknownMimeTypes); ++i) {
+  for (size_t i = 0; i < arraysize(kUnknownMimeTypes); ++i) {
     if (mime_type == kUnknownMimeTypes[i]) {
       counter.Add(i);
       return true;
@@ -536,7 +535,7 @@ bool ShouldSniffMimeType(const GURL& url, const std::string& mime_type) {
   };
   static SnifferHistogram counter(L"mime_sniffer.kSniffableTypes",
                                   arraysize(kSniffableTypes) + 1);
-  for (int i = 0; i < arraysize(kSniffableTypes); ++i) {
+  for (size_t i = 0; i < arraysize(kSniffableTypes); ++i) {
     if (mime_type == kSniffableTypes[i]) {
       counter.Add(i);
       return true;
-- 
cgit v1.1