Revert 184352

base/utf_string_conversions.h

Index: base/utf_string_conversions.h
===================================================================
--- base/utf_string_conversions.h	(revision 184354)
+++ base/utf_string_conversions.h	(working copy)
@@ -11,8 +11,6 @@
 #include "base/string16.h"
 #include "base/string_piece.h"
 
-namespace base {
-
 // These convert between UTF-8, -16, and -32 strings. They are potentially slow,
 // so avoid unnecessary conversions. The low-level versions return a boolean
 // indicating whether the conversion was 100% valid. In this case, it will still
@@ -57,23 +55,4 @@
 BASE_EXPORT std::wstring ASCIIToWide(const base::StringPiece& ascii);
 BASE_EXPORT string16 ASCIIToUTF16(const base::StringPiece& ascii);
 
-}  // namespace base
-
-// TODO(brettw) remove these usings once all code has been converted to using
-// the namespaces.
-using base::WideToUTF8;
-using base::WideToUTF8;
-using base::UTF8ToWide;
-using base::UTF8ToWide;
-using base::WideToUTF16;
-using base::WideToUTF16;
-using base::UTF16ToWide;
-using base::UTF16ToWide;
-using base::UTF8ToUTF16;
-using base::UTF8ToUTF16;
-using base::UTF16ToUTF8;
-using base::UTF16ToUTF8;
-using base::ASCIIToWide;
-using base::ASCIIToUTF16;
-
 #endif  // BASE_UTF_STRING_CONVERSIONS_H_