Revert 49982 - patch

base/logging.h

Index: base/logging.h
===================================================================
--- base/logging.h	(revision 50001)
+++ base/logging.h	(working copy)
@@ -101,18 +101,6 @@
 // There is also the special severity of DFATAL, which logs FATAL in
 // debug mode, ERROR_REPORT in normal mode.
 
-// XXX better comment -- must be before we use << and in global namespace
-// These functions are provided as a convenience for logging, which is where we
-// use streams (it is against Google style to use streams in other places). It
-// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-// which is normally ASCII. It is relatively slow, so try not to use it for
-// common cases. Non-ASCII characters will be converted to UTF-8 by these
-// operators.
-std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-  return out << wstr.c_str();
-}
-
 namespace logging {
 
 // Where to record logging output? A flat file and/or system debug log via
@@ -825,6 +813,17 @@
 
 }  // namespace logging
 
+// These functions are provided as a convenience for logging, which is where we
+// use streams (it is against Google style to use streams in other places). It
+// is designed to allow you to emit non-ASCII Unicode strings to the log file,
+// which is normally ASCII. It is relatively slow, so try not to use it for
+// common cases. Non-ASCII characters will be converted to UTF-8 by these
+// operators.
+std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
+inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
+  return out << wstr.c_str();
+}
+
 // The NOTIMPLEMENTED() macro annotates codepaths which have
 // not been implemented yet.
 //