Remove UTF string conversion functions from the global namespace.

base/strings/utf_string_conversions.h

 // Copyright (c) 2011 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.
 
 #ifndef BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
 #define BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
 
 #include <string>
 
 #include "base/base_export.h"
@@ skipping 21 matching lines @@
 BASE_EXPORT bool UTF16ToWide(const char16* src, size_t src_len,
                              std::wstring* output);
 BASE_EXPORT std::wstring UTF16ToWide(const string16& utf16);
 
 BASE_EXPORT bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
 BASE_EXPORT string16 UTF8ToUTF16(const StringPiece& utf8);
 BASE_EXPORT bool UTF16ToUTF8(const char16* src, size_t src_len,
                              std::string* output);
 BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16);
 
-// We are trying to get rid of wstring as much as possible, but it's too big
-// a mess to do it all at once.  These conversions should be used when we
-// really should just be passing a string16 around, but we haven't finished
-// porting whatever module uses wstring and the conversion is being used as a
-// stopcock.  This makes it easy to grep for the ones that should be removed.
-#if defined(OS_WIN)
-# define WideToUTF16Hack
-# define UTF16ToWideHack
-#else
-# define WideToUTF16Hack WideToUTF16
-# define UTF16ToWideHack UTF16ToWide
-#endif
-
 // These convert an ASCII string, typically a hardcoded constant, to a
 // UTF16/Wide string.
 BASE_EXPORT std::wstring ASCIIToWide(const StringPiece& ascii);
 BASE_EXPORT string16 ASCIIToUTF16(const StringPiece& ascii);
 
 }  // namespace base
 
-// TODO(brettw) remove these when callers are fixed up.
-using base::WideToUTF8;
-using base::UTF8ToWide;
-using base::WideToUTF16;
-using base::UTF16ToWide;
-using base::UTF8ToUTF16;
-using base::UTF16ToUTF8;
-using base::ASCIIToWide;
-using base::ASCIIToUTF16;
+// We are trying to get rid of wstring as much as possible, but it's too big a
+// mess to do it all at once.  These synonyms should be used when we really
+// should just be passing a string16 around, but we haven't finished porting
+// whatever module uses wstring and the conversion is being used as a stopgap.
+// This makes it easy to grep for the ones that should be removed.
+#define WideToUTF16Hack WideToUTF16
+#define UTF16ToWideHack UTF16ToWide
 
 #endif  // BASE_STRINGS_UTF_STRING_CONVERSIONS_H_