Update SplitString calls to new form

content/common/plugin_list.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 "content/common/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 112 matching lines @@
 
   return PluginList::ReadWebPluginInfo(filename, info);
 }
 
 // static
 bool PluginList::ParseMimeTypes(
     const std::string& mime_types_str,
     const std::string& file_extensions_str,
     const base::string16& mime_type_descriptions_str,
     std::vector<WebPluginMimeType>* parsed_mime_types) {
-  std::vector<std::string> mime_types, file_extensions;
-  std::vector<base::string16> descriptions;
-  base::SplitString(mime_types_str, '|', &mime_types);
-  base::SplitString(file_extensions_str, '|', &file_extensions);
-  base::SplitString(mime_type_descriptions_str, '|', &descriptions);
+  std::vector<std::string> mime_types = base::SplitString(
+      mime_types_str, "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> file_extensions = base::SplitString(
+      file_extensions_str, "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<base::string16> descriptions = base::SplitString(
+      mime_type_descriptions_str, base::string16(1, '|'), base::TRIM_WHITESPACE,
+      base::SPLIT_WANT_ALL);
 
   parsed_mime_types->clear();
 
   if (mime_types.empty())
     return false;
 
   for (size_t i = 0; i < mime_types.size(); ++i) {
     WebPluginMimeType mime_type;
     mime_type.mime_type = base::StringToLowerASCII(mime_types[i]);
-    if (file_extensions.size() > i)
-      base::SplitString(file_extensions[i], ',', &mime_type.file_extensions);
+    if (file_extensions.size() > i) {
+      mime_type.file_extensions = base::SplitString(
+          file_extensions[i], ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    }
 
     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(base::ASCIIToUTF16("(*"));
       if (ext != base::string16::npos) {
         if (ext > 1 && mime_type.description[ext - 1] == ' ')
@@ skipping 247 matching lines @@
                 plugin_path);
   if (it != extra_plugin_paths_.end())
     extra_plugin_paths_.erase(it);
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace content