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

webkit/glue/plugins/plugin_list.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 "webkit/glue/plugins/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 98 matching lines @@
   // Not an internal plugin.
   *entry_points = NULL;
 
   return PluginLib::ReadWebPluginInfo(filename, info);
 }
 
 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();
 
   if (mime_types.empty()) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Plugin " << pvi.product_name << " has no MIME types, skipping";
     return false;
   }
 
   info->name = WideToUTF16(pvi.product_name);
   info->desc = WideToUTF16(pvi.file_description);
   info->version = WideToUTF16(pvi.file_version);
   info->path = pvi.path;
   info->enabled = true;
 
   for (size_t i = 0; i < mime_types.size(); ++i) {
     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];
 
       // On Windows, the description likely has a list of file extensions
       // embedded in it (e.g. "SurfWriter file (*.swr)"). Remove an extension
       // list from the description if it is present.
       size_t ext = mime_type.description.find(ASCIIToUTF16("(*"));
       if (ext != string16::npos) {
         if (ext > 1 && mime_type.description[ext -1] == ' ')
@@ skipping 210 matching lines @@
        ++it) {
     if (it->enabled)
       plugins->push_back(*it);
   }
 }
 
 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);
 
   LoadPlugins(false);
   AutoLock lock(lock_);
   info->clear();
   if (actual_mime_types)
     actual_mime_types->clear();
 
   std::set<FilePath> visited_plugins;
@@ skipping 64 matching lines @@
                                bool allow_wildcard,
                                WebPluginInfo* info,
                                std::string* actual_mime_type) {
   DCHECK(info);
   std::vector<WebPluginInfo> info_list;
 
   // GetPluginInfoArray has slightly less work to do if we can pass
   // 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];
       return true;
     }
   } else {
     GetPluginInfoArray(url, mime_type, allow_wildcard, &info_list, NULL);
     if (!info_list.empty()) {
       *info = info_list[0];
       return true;
@@ skipping 144 matching lines @@
 }
 
 PluginList::~PluginList() {
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
 }  // namespace NPAPI