Move TrimWhitespace to the base namespace.

base/nix/mime_util_xdg.cc

 // Copyright (c) 2012 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/nix/mime_util_xdg.h"
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
@@ skipping 249 matching lines @@
   if (!fp)
     return false;
 
   // Read entries.
   while (!feof(fp) && !ferror(fp)) {
     std::string buf = ReadLine(fp);
     if (buf == "")
       break;
 
     std::string entry;
-    TrimWhitespaceASCII(buf, TRIM_ALL, &entry);
+    base::TrimWhitespaceASCII(buf, base::TRIM_ALL, &entry);
     if (entry.length() == 0 || entry[0] == '#') {
       // Blank line or Comment.
       continue;
     } else if (entry[0] == '[' && info_array_.get()) {
       current_info = NULL;
       std::string subdir = entry.substr(1, entry.length() - 2);
       if (subdirs_.find(subdir) != subdirs_.end())
         current_info = &info_array_[subdirs_[subdir]];
     }
 
     std::string key, value;
     std::vector<std::string> r;
     SplitStringDontTrim(entry, '=', &r);
     if (r.size() < 2)
       continue;
 
-    TrimWhitespaceASCII(r[0], TRIM_ALL, &key);
+    base::TrimWhitespaceASCII(r[0], base::TRIM_ALL, &key);
     for (size_t i = 1; i < r.size(); i++)
       value.append(r[i]);
-    TrimWhitespaceASCII(value, TRIM_ALL, &value);
+    base::TrimWhitespaceASCII(value, base::TRIM_ALL, &value);
 
     if (current_info) {
       if (key == "Size") {
         current_info->size = atoi(value.c_str());
       } else if (key == "Type") {
         if (value == "Fixed")
           current_info->type = SubDirInfo::Fixed;
         else if (value == "Scalable")
           current_info->type = SubDirInfo::Scalable;
         else if (value == "Threshold")
@@ skipping 58 matching lines @@
   }
 
   return result;
 }
 
 bool IconTheme::SetDirectories(const std::string& dirs) {
   int num = 0;
   std::string::size_type pos = 0, epos;
   std::string dir;
   while ((epos = dirs.find(',', pos)) != std::string::npos) {
-    TrimWhitespaceASCII(dirs.substr(pos, epos - pos), TRIM_ALL, &dir);
+    base::TrimWhitespaceASCII(dirs.substr(pos, epos - pos), base::TRIM_ALL,
+                              &dir);
     if (dir.length() == 0) {
       DLOG(WARNING) << "Invalid index.theme: blank subdir";
       return false;
     }
     subdirs_[dir] = num++;
     pos = epos + 1;
   }
-  TrimWhitespaceASCII(dirs.substr(pos), TRIM_ALL, &dir);
+  base::TrimWhitespaceASCII(dirs.substr(pos), base::TRIM_ALL, &dir);
   if (dir.length() == 0) {
     DLOG(WARNING) << "Invalid index.theme: blank subdir";
     return false;
   }
   subdirs_[dir] = num++;
   info_array_.reset(new SubDirInfo[num]);
   return true;
 }
 
 bool CheckDirExistsAndGetMtime(const FilePath& dir, Time* last_modified) {
@@ skipping 256 matching lines @@
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace nix
 }  // namespace base