Index: base/strings/string_util.h |
diff --git a/base/strings/string_util.h b/base/strings/string_util.h |
index 0bdf2efd4c4e9dc61b6fbb42c7219be6b8eeb6a2..c17429e62d43cea6dc6e8f9b12e2f2c85ca2a72d 100644 |
--- a/base/strings/string_util.h |
+++ b/base/strings/string_util.h |
@@ -285,38 +285,42 @@ template <class str> inline str StringToUpperASCII(const str& s) { |
StringToUpperASCII(&output); |
return output; |
} |
- |
-} // namespace base |
- |
-#if defined(OS_WIN) |
-#include "base/strings/string_util_win.h" |
-#elif defined(OS_POSIX) |
-#include "base/strings/string_util_posix.h" |
-#else |
-#error Define string operations appropriately for your platform |
-#endif |
- |
+// |
// Compare the lower-case form of the given string against the given ASCII |
// string. This is useful for doing checking if an input string matches some |
// token, and it is optimized to avoid intermediate string copies. This API is |
// borrowed from the equivalent APIs in Mozilla. |
BASE_EXPORT bool LowerCaseEqualsASCII(const std::string& a, const char* b); |
-BASE_EXPORT bool LowerCaseEqualsASCII(const base::string16& a, const char* b); |
+BASE_EXPORT bool LowerCaseEqualsASCII(const string16& a, const char* b); |
// Same thing, but with string iterators instead. |
BASE_EXPORT bool LowerCaseEqualsASCII(std::string::const_iterator a_begin, |
std::string::const_iterator a_end, |
const char* b); |
-BASE_EXPORT bool LowerCaseEqualsASCII(base::string16::const_iterator a_begin, |
- base::string16::const_iterator a_end, |
+BASE_EXPORT bool LowerCaseEqualsASCII(string16::const_iterator a_begin, |
+ string16::const_iterator a_end, |
const char* b); |
BASE_EXPORT bool LowerCaseEqualsASCII(const char* a_begin, |
const char* a_end, |
const char* b); |
-BASE_EXPORT bool LowerCaseEqualsASCII(const base::char16* a_begin, |
- const base::char16* a_end, |
+BASE_EXPORT bool LowerCaseEqualsASCII(const char* a_begin, |
+ const char* a_end, |
+ const char* b_begin, |
+ const char* b_end); |
+BASE_EXPORT bool LowerCaseEqualsASCII(const char16* a_begin, |
+ const char16* a_end, |
const char* b); |
+} // namespace base |
+ |
+#if defined(OS_WIN) |
+#include "base/strings/string_util_win.h" |
+#elif defined(OS_POSIX) |
+#include "base/strings/string_util_posix.h" |
+#else |
+#error Define string operations appropriately for your platform |
+#endif |
+ |
// Performs a case-sensitive string compare. The behavior is undefined if both |
// strings are not ASCII. |
BASE_EXPORT bool EqualsASCII(const base::string16& a, const base::StringPiece& b); |