base: Move SplitString functions into the base namespace and update the callers.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/3750001

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

6 files changed, 18 insertions, 16 deletions

diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm
index 07da77c..bd2bcbb 100644
--- a/webkit/glue/plugins/plugin_lib_mac.mm
+++ b/webkit/glue/plugins/plugin_lib_mac.mm
@@ -200,8 +200,8 @@ bool ReadSTRPluginInfo(const FilePath& filename, CFBundleRef bundle,
     mime.mime_type = StringToLowerASCII(type_strings[2*i]);
     if (have_type_descs && i < type_descs.size())
       mime.description = UTF8ToUTF16(type_descs[i]);
-    SplitString(StringToLowerASCII(type_strings[2*i+1]), ',',
-                &mime.file_extensions);
+    base::SplitString(
+        StringToLowerASCII(type_strings[2*i+1]), ',', &mime.file_extensions);
 
     info->mime_types.push_back(mime);
   }
diff --git a/webkit/glue/plugins/plugin_lib_posix.cc b/webkit/glue/plugins/plugin_lib_posix.cc
index fb813b6..ac937e1 100644
--- a/webkit/glue/plugins/plugin_lib_posix.cc
+++ b/webkit/glue/plugins/plugin_lib_posix.cc
@@ -235,7 +235,7 @@ void PluginLib::ParseMIMEDescription(
     if (end == std::string::npos)
       break;
     const std::string extensions = description.substr(ofs, end - ofs);
-    SplitString(extensions, ',', &mime_type.file_extensions);
+    base::SplitString(extensions, ',', &mime_type.file_extensions);
     ofs = end + 1;
 
     end = description.find(';', ofs);
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 2669af5..4b3ce27 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -116,9 +116,9 @@ bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
                                      WebPluginInfo* info) {
   std::vector<std::string> mime_types, file_extensions;
   std::vector<string16> descriptions;
-  SplitString(WideToUTF8(pvi.mime_types), '|', &mime_types);
-  SplitString(WideToUTF8(pvi.file_extensions), '|', &file_extensions);
-  SplitString(WideToUTF16(pvi.type_descriptions), '|', &descriptions);
+  base::SplitString(WideToUTF8(pvi.mime_types), '|', &mime_types);
+  base::SplitString(WideToUTF8(pvi.file_extensions), '|', &file_extensions);
+  base::SplitString(WideToUTF16(pvi.type_descriptions), '|', &descriptions);
 
   info->mime_types.clear();
 
@@ -138,7 +138,7 @@ bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
     WebPluginMimeType mime_type;
     mime_type.mime_type = StringToLowerASCII(mime_types[i]);
     if (file_extensions.size() > i)
-      SplitString(file_extensions[i], ',', &mime_type.file_extensions);
+      base::SplitString(file_extensions[i], ',', &mime_type.file_extensions);
 
     if (descriptions.size() > i) {
       mime_type.description = descriptions[i];
@@ -369,7 +369,8 @@ void PluginList::GetPluginInfoArray(const GURL& url,
                                     const std::string& mime_type,
                                     bool allow_wildcard,
                                     std::vector<WebPluginInfo>* info,
-                                    std::vector<std::string>* actual_mime_types) {
+                                    std::vector<std::string>* actual_mime_types)
+{
   DCHECK(mime_type == StringToLowerASCII(mime_type));
   DCHECK(info);
 
@@ -454,7 +455,8 @@ bool PluginList::GetPluginInfo(const GURL& url,
   // NULL for the mime type list...
   if (actual_mime_type) {
     std::vector<std::string> mime_type_list;
-    GetPluginInfoArray(url, mime_type, allow_wildcard, &info_list, &mime_type_list);
+    GetPluginInfoArray(
+        url, mime_type, allow_wildcard, &info_list, &mime_type_list);
     if (!info_list.empty()) {
       *info = info_list[0];
       *actual_mime_type = mime_type_list[0];
diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc
index b23909b..72891d1 100644
--- a/webkit/glue/plugins/plugin_list_posix.cc
+++ b/webkit/glue/plugins/plugin_list_posix.cc
@@ -133,7 +133,7 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   const char* moz_plugin_path = getenv("MOZ_PLUGIN_PATH");
   if (moz_plugin_path) {
     std::vector<std::string> paths;
-    SplitString(moz_plugin_path, ':', &paths);
+    base::SplitString(moz_plugin_path, ':', &paths);
     for (size_t i = 0; i < paths.size(); ++i)
       plugin_dirs->push_back(FilePath(paths[i]));
   }
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc
index b5ded9e..e515e10 100644
--- a/webkit/glue/plugins/plugin_list_win.cc
+++ b/webkit/glue/plugins/plugin_list_win.cc
@@ -304,13 +304,13 @@ bool HaveSharedMimeType(const WebPluginInfo& plugin1,
 // version is newer than a's, or false if it's equal or older.
 bool IsNewerVersion(const std::wstring& a, const std::wstring& b) {
   std::vector<std::wstring> a_ver, b_ver;
-  SplitString(a, ',', &a_ver);
-  SplitString(b, ',', &b_ver);
+  base::SplitString(a, ',', &a_ver);
+  base::SplitString(b, ',', &b_ver);
   if (a_ver.size() == 1 && b_ver.size() == 1) {
     a_ver.clear();
     b_ver.clear();
-    SplitString(a, '.', &a_ver);
-    SplitString(b, '.', &b_ver);
+    base::SplitString(a, '.', &a_ver);
+    base::SplitString(b, '.', &b_ver);
   }
   if (a_ver.size() != b_ver.size())
     return false;
@@ -371,7 +371,7 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
   // and don't depend on XPCOM.
   if (filename == kJavaPlugin1 || filename == kJavaPlugin2) {
     std::vector<std::wstring> ver;
-    SplitString(info.version, '.', &ver);
+    base::SplitString(info.version, '.', &ver);
     int major, minor, update;
     if (ver.size() == 4 &&
         base::StringToInt(ver[0], &major) &&
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index 8c88680..2a10775 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -289,7 +289,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
   } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
     std::vector<std::wstring> version;
-    SplitString(plugin_info.version, L'.', &version);
+    base::SplitString(plugin_info.version, L'.', &version);
     if (version.size() > 0) {
       int major;
       base::StringToInt(version[0], &major);