Merge some changes in net/base from branches/mac_july_2008 to trunk.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@420 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/net/base/escape.cc b/net/base/escape.cc
index 330a3ed..b13bb9d 100644
--- a/net/base/escape.cc
+++ b/net/base/escape.cc
@@ -270,7 +270,7 @@ void AppendEscapedCharForHTMLImpl(typename str::value_type c, str* output) {
     { '\'', "'" },
   };
   size_t k;
-  for (k = 0; k < arraysize(kCharsToEscape); ++k) {
+  for (k = 0; k < ARRAYSIZE_UNSAFE(kCharsToEscape); ++k) {
     if (c == kCharsToEscape[k].key) {
       const char* p = kCharsToEscape[k].replacement;
       while (*p)
@@ -278,7 +278,7 @@ void AppendEscapedCharForHTMLImpl(typename str::value_type c, str* output) {
       break;
     }
   }
-  if (k == arraysize(kCharsToEscape))
+  if (k == ARRAYSIZE_UNSAFE(kCharsToEscape))
     output->push_back(c);
 }
 
@@ -295,7 +295,7 @@ str EscapeForHTMLImpl(const str& input) {
   str result;
   result.reserve(input.size());  // optimize for no escaping
 
-  for (str::const_iterator it = input.begin(); it != input.end(); ++it)
+  for (typename str::const_iterator it = input.begin(); it != input.end(); ++it)
     AppendEscapedCharForHTMLImpl(*it, &result);
 
   return result;