Move StringToUpperASCII to base namespace

base/strings/string_util.h

Index: base/strings/string_util.h
diff --git a/base/strings/string_util.h b/base/strings/string_util.h
index 5ab2ad5d5477f2a648aa081dda0ad2a5e859754d..0bdf2efd4c4e9dc61b6fbb42c7219be6b8eeb6a2 100644
--- a/base/strings/string_util.h
+++ b/base/strings/string_util.h
@@ -272,21 +272,11 @@ template <class str> inline str StringToLowerASCII(const str& s) {
   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
-
 // Converts the elements of the given string.  This version uses a pointer to
 // clearly differentiate it from the non-pointer variant.
 template <class str> inline void StringToUpperASCII(str* s) {
   for (typename str::iterator i = s->begin(); i != s->end(); ++i)
-    *i = base::ToUpperASCII(*i);
+    *i = ToUpperASCII(*i);
 }
 
 template <class str> inline str StringToUpperASCII(const str& s) {
@@ -296,6 +286,16 @@ template <class str> inline str StringToUpperASCII(const str& s) {
   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