Revert 184352

base/utf_string_conversions.cc

 // Copyright (c) 2010 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.
 
 #include "base/utf_string_conversions.h"
 
 #include "base/string_piece.h"
 #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 {
 
 // Generalized Unicode converter -----------------------------------------------
 
 // Converts the given source Unicode character type to the given destination
 // Unicode character type as a STL string. The given input buffer and size
 // determine the source, and the given output STL string will be replaced by
 // the result.
 template<typename SRC_CHAR, typename DEST_STRING>
@@ skipping 31 matching lines @@
   // invalid input, which is what we want here.
   WideToUTF8(wide.data(), wide.length(), &ret);
   return ret;
 }
 
 bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output) {
   PrepareForUTF16Or32Output(src, src_len, 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;
 }
 
 // UTF-16 <-> Wide -------------------------------------------------------------
 
 #if defined(WCHAR_T_IS_UTF16)
 
 // When wide == UTF-16, then conversions are a NOP.
@@ skipping 49 matching lines @@
 
 // UTF16 <-> UTF8 --------------------------------------------------------------
 
 #if defined(WCHAR_T_IS_UTF32)
 
 bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
   PrepareForUTF16Or32Output(src, src_len, 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.
   UTF8ToUTF16(utf8.data(), utf8.length(), &ret);
   return ret;
 }
 
 bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) {
   PrepareForUTF8Output(src, src_len, output);
   return ConvertUnicode(src, src_len, output);
 }
 
 std::string UTF16ToUTF8(const string16& utf16) {
   std::string ret;
   // Ignore the success flag of this call, it will do the best it can for
   // invalid input, which is what we want here.
   UTF16ToUTF8(utf16.data(), utf16.length(), &ret);
   return ret;
 }
 
 #elif defined(WCHAR_T_IS_UTF16)
 // Easy case since we can use the "wide" versions we already wrote above.
 
 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);
 }
 
 bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) {
   return WideToUTF8(src, src_len, output);
 }
 
 std::string UTF16ToUTF8(const string16& utf16) {
   return WideToUTF8(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