Move TrimWhitespace to the base namespace.

chrome/common/net/url_fixer_upper.cc

Index: chrome/common/net/url_fixer_upper.cc
diff --git a/chrome/common/net/url_fixer_upper.cc b/chrome/common/net/url_fixer_upper.cc
index 13c923b5121cc7fdbc621f1823439b0a783fcd1b..96d7f4ecf7aa466466fd8f4ad98ceae4a1cb7e27 100644
--- a/chrome/common/net/url_fixer_upper.cc
+++ b/chrome/common/net/url_fixer_upper.cc
@@ -74,16 +74,17 @@ void UTF8PartsToUTF16Parts(const std::string& text_utf8,
       UTF8ComponentToUTF16Component(text_utf8, parts_utf8.ref);
 }
 
-TrimPositions TrimWhitespaceUTF8(const std::string& input,
-                                 TrimPositions positions,
-                                 std::string* output) {
+base::TrimPositions TrimWhitespaceUTF8(const std::string& input,
+                                       base::TrimPositions positions,
+                                       std::string* output) {
   // This implementation is not so fast since it converts the text encoding
   // twice. Please feel free to file a bug if this function hurts the
   // performance of Chrome.
   DCHECK(IsStringUTF8(input));
   base::string16 input16 = base::UTF8ToUTF16(input);
   base::string16 output16;
-  TrimPositions result = TrimWhitespace(input16, positions, &output16);
+  base::TrimPositions result =
+      base::TrimWhitespace(input16, positions, &output16);
   *output = base::UTF16ToUTF8(output16);
   return result;
 }
@@ -92,10 +93,10 @@ TrimPositions TrimWhitespaceUTF8(const std::string& input,
 void PrepareStringForFileOps(const base::FilePath& text,
                              base::FilePath::StringType* output) {
 #if defined(OS_WIN)
-  TrimWhitespace(text.value(), TRIM_ALL, output);
+  base::TrimWhitespace(text.value(), base::TRIM_ALL, output);
   replace(output->begin(), output->end(), '/', '\\');
 #else
-  TrimWhitespaceUTF8(text.value(), TRIM_ALL, output);
+  TrimWhitespaceUTF8(text.value(), base::TRIM_ALL, output);
 #endif
 }
 
@@ -389,7 +390,7 @@ std::string SegmentURLInternal(std::string* text, url_parse::Parsed* parts) {
   *parts = url_parse::Parsed();
 
   std::string trimmed;
-  TrimWhitespaceUTF8(*text, TRIM_ALL, &trimmed);
+  TrimWhitespaceUTF8(*text, base::TRIM_ALL, &trimmed);
   if (trimmed.empty())
     return std::string();  // Nothing to segment.
 
@@ -501,7 +502,7 @@ base::string16 URLFixerUpper::SegmentURL(const base::string16& text,
 GURL URLFixerUpper::FixupURL(const std::string& text,
                              const std::string& desired_tld) {
   std::string trimmed;
-  TrimWhitespaceUTF8(text, TRIM_ALL, &trimmed);
+  TrimWhitespaceUTF8(text, base::TRIM_ALL, &trimmed);
   if (trimmed.empty())
     return GURL();  // Nothing here.