Revert 184352

> Add utf_string_conversions to base namespace.
> 
> This adds "using"s for all functions so those can be fixed in a separate pass.
> 
> This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
> 
> BUG=
> 
> Review URL: https://codereview.chromium.org/12314090

TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12315071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 30 deletions

diff --git a/base/utf_string_conversions.cc b/base/utf_string_conversions.cc
index 5e5f6ed..9af79e2 100644
--- a/base/utf_string_conversions.cc
+++ b/base/utf_string_conversions.cc
@@ -8,7 +8,10 @@
 #include "base/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
 
-namespace base {
+using base::PrepareForUTF8Output;
+using base::PrepareForUTF16Or32Output;
+using base::ReadUnicodeCharacter;
+using base::WriteUnicodeCharacter;
 
 namespace {
 
@@ -60,7 +63,7 @@ bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output) {
   return ConvertUnicode(src, src_len, output);
 }
 
-std::wstring UTF8ToWide(const StringPiece& utf8) {
+std::wstring UTF8ToWide(const base::StringPiece& utf8) {
   std::wstring ret;
   UTF8ToWide(utf8.data(), utf8.length(), &ret);
   return ret;
@@ -130,7 +133,7 @@ bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
   return ConvertUnicode(src, src_len, output);
 }
 
-string16 UTF8ToUTF16(const StringPiece& utf8) {
+string16 UTF8ToUTF16(const base::StringPiece& utf8) {
   string16 ret;
   // Ignore the success flag of this call, it will do the best it can for
   // invalid input, which is what we want here.
@@ -158,7 +161,7 @@ bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
   return UTF8ToWide(src, src_len, output);
 }
 
-string16 UTF8ToUTF16(const StringPiece& utf8) {
+string16 UTF8ToUTF16(const base::StringPiece& utf8) {
   return UTF8ToWide(utf8);
 }
 
@@ -172,14 +175,12 @@ std::string UTF16ToUTF8(const string16& utf16) {
 
 #endif
 
-std::wstring ASCIIToWide(const StringPiece& ascii) {
+std::wstring ASCIIToWide(const base::StringPiece& ascii) {
   DCHECK(IsStringASCII(ascii)) << ascii;
   return std::wstring(ascii.begin(), ascii.end());
 }
 
-string16 ASCIIToUTF16(const StringPiece& ascii) {
+string16 ASCIIToUTF16(const base::StringPiece& ascii) {
   DCHECK(IsStringASCII(ascii)) << ascii;
   return string16(ascii.begin(), ascii.end());
 }
-
-}  // namespace base
diff --git a/base/utf_string_conversions.h b/base/utf_string_conversions.h
index 83cd03b..5a391fa 100644
--- a/base/utf_string_conversions.h
+++ b/base/utf_string_conversions.h
@@ -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::string UTF16ToUTF8(const string16& utf16);
 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_
diff --git a/base/utf_string_conversions_unittest.cc b/base/utf_string_conversions_unittest.cc
index c6ef80d..7c180a6 100644
--- a/base/utf_string_conversions_unittest.cc
+++ b/base/utf_string_conversions_unittest.cc
@@ -208,4 +208,4 @@ TEST(UTFStringConversionsTest, ConvertMultiString) {
   EXPECT_EQ(expected, converted);
 }
 
-}  // namespace base
+}  // base