Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/base/strings/string_util.cc

 // Copyright 2013 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.
 
 #include "base/strings/string_util.h"
 
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
 #include <stdarg.h>
@@ skipping 336 matching lines @@
 
   while (char_index < src_len) {
     int32 code_point;
     CBU8_NEXT(src, char_index, src_len, code_point);
     if (!IsValidCharacter(code_point))
       return false;
   }
   return true;
 }
 
-template<typename StringType>
-static inline bool DoLowerCaseEqualsASCII(BasicStringPiece<StringType> str,
-                                          const char* lower_cased_cmp) {
-  for (typename BasicStringPiece<StringType>::const_iterator it = str.begin();
-       it != str.end(); ++it, ++lower_cased_cmp) {
-    if (!*lower_cased_cmp || base::ToLowerASCII(*it) != *lower_cased_cmp)
+}  // namespace base
+
+template<typename Iter>
+static inline bool DoLowerCaseEqualsASCII(Iter a_begin,
+                                          Iter a_end,
+                                          const char* b) {
+  for (Iter it = a_begin; it != a_end; ++it, ++b) {
+    if (!*b || base::ToLowerASCII(*it) != *b)
       return false;
   }
-  return *lower_cased_cmp == 0;
+  return *b == 0;
 }
 
 // Front-ends for LowerCaseEqualsASCII.
-bool LowerCaseEqualsASCII(StringPiece str, const char* lower_cased_cmp) {
-  return DoLowerCaseEqualsASCII(str, lower_cased_cmp);
+bool LowerCaseEqualsASCII(const std::string& a, const char* b) {
+  return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
 }
 
-bool LowerCaseEqualsASCII(StringPiece16 str, const char* lower_cased_cmp) {
-  return DoLowerCaseEqualsASCII(str, lower_cased_cmp);
+bool LowerCaseEqualsASCII(const string16& a, const char* b) {
+  return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
 }
 
 bool LowerCaseEqualsASCII(std::string::const_iterator a_begin,
                           std::string::const_iterator a_end,
                           const char* b) {
-  const char* a = &*a_begin;
-  return LowerCaseEqualsASCII(StringPiece(a, a_end - a_begin), b);
+  return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
 
 bool LowerCaseEqualsASCII(string16::const_iterator a_begin,
                           string16::const_iterator a_end,
                           const char* b) {
-  const char16* a = &*a_begin;
-  return LowerCaseEqualsASCII(StringPiece16(a, a_end - a_begin), b);
+  return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
 
 // TODO(port): Resolve wchar_t/iterator issues that require OS_ANDROID here.
 #if !defined(OS_ANDROID)
 bool LowerCaseEqualsASCII(const char* a_begin,
                           const char* a_end,
                           const char* b) {
-  return DoLowerCaseEqualsASCII(StringPiece(a_begin, a_end - a_begin), b);
+  return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
 
 bool LowerCaseEqualsASCII(const char16* a_begin,
                           const char16* a_end,
                           const char* b) {
-  return DoLowerCaseEqualsASCII(StringPiece16(a_begin, a_end - a_begin), b);
+  return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
+
 #endif  // !defined(OS_ANDROID)
 
-}  // namespace base
-
 bool EqualsASCII(const string16& a, const base::StringPiece& b) {
   if (a.length() != b.length())
     return false;
   return std::equal(b.begin(), b.end(), a.begin());
 }
 
 bool StartsWithASCII(const std::string& str,
                      const std::string& search,
                      bool case_sensitive) {
   if (case_sensitive)
@@ skipping 466 matching lines @@
 }
 
 }  // namespace
 
 size_t base::strlcpy(char* dst, const char* src, size_t dst_size) {
   return lcpyT<char>(dst, src, dst_size);
 }
 size_t base::wcslcpy(wchar_t* dst, const wchar_t* src, size_t dst_size) {
   return lcpyT<wchar_t>(dst, src, dst_size);
 }