Move RemoveChars, ReplaceChars, TrimString, and TruncateUTF8ToByteSize to base namespace.

base/strings/string_util.cc

 // Copyright 2013 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/strings/string_util.h"
 
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
 #include <stdarg.h>
@@ skipping 98 matching lines @@
 }
 
 const std::wstring& EmptyWString() {
   return EmptyStrings::GetInstance()->ws;
 }
 
 const string16& EmptyString16() {
   return EmptyStrings::GetInstance()->s16;
 }
 
-}  // namespace base
-
 template<typename STR>
 bool ReplaceCharsT(const STR& input,
                    const typename STR::value_type replace_chars[],
                    const STR& replace_with,
                    STR* output) {
   bool removed = false;
   size_t replace_length = replace_with.length();
 
   *output = input;
 
@@ skipping 92 matching lines @@
   const char* data = input.data();
 
   // Using CBU8, we will move backwards from the truncation point
   // to the beginning of the string looking for a valid UTF8
   // character.  Once a full UTF8 character is found, we will
   // truncate the string to the end of that character.
   while (char_index >= 0) {
     int32 prev = char_index;
     uint32 code_point = 0;
     CBU8_NEXT(data, char_index, truncation_length, code_point);
-    if (!base::IsValidCharacter(code_point) ||
-        !base::IsValidCodepoint(code_point)) {
+    if (!IsValidCharacter(code_point) ||
+        !IsValidCodepoint(code_point)) {
       char_index = prev - 1;
     } else {
       break;
     }
   }
 
   if (char_index >= 0 )
     *output = input.substr(0, char_index);
   else
     output->clear();
 }
 
+}  // namespace base
+
 TrimPositions TrimWhitespace(const base::string16& input,
                              TrimPositions positions,
                              base::string16* output) {
-  return TrimStringT(input, base::kWhitespaceUTF16, positions, output);
+  return base::TrimStringT(input, base::kWhitespaceUTF16, positions, output);
 }
 
 TrimPositions TrimWhitespaceASCII(const std::string& input,
                                   TrimPositions positions,
                                   std::string* output) {
-  return TrimStringT(input, base::kWhitespaceASCII, positions, output);
+  return base::TrimStringT(input, base::kWhitespaceASCII, positions, output);
 }
 
 // This function is only for backward-compatibility.
 // To be removed when all callers are updated.
 TrimPositions TrimWhitespace(const std::string& input,
                              TrimPositions positions,
                              std::string* output) {
   return TrimWhitespaceASCII(input, positions, output);
 }
 
@@ skipping 661 matching lines @@
 }
 
 }  // namespace
 
 size_t base::strlcpy(char* dst, const char* src, size_t dst_size) {
   return lcpyT<char>(dst, src, dst_size);
 }
 size_t base::wcslcpy(wchar_t* dst, const wchar_t* src, size_t dst_size) {
   return lcpyT<wchar_t>(dst, src, dst_size);
 }