Revert of Update SplitString calls to new form

content/common/pepper_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/pepper_plugin_list.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
@@ skipping 34 matching lines @@
           switches::kRegisterPepperPlugins);
   if (value.empty())
     return;
 
   // FORMAT:
   // command-line = <plugin-entry> + *( LWS + "," + LWS + <plugin-entry> )
   // plugin-entry =
   //    <file-path> +
   //    ["#" + <name> + ["#" + <description> + ["#" + <version>]]] +
   //    *1( LWS + ";" + LWS + <mime-type> )
-  std::vector<std::string> modules = base::SplitString(
-      value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> modules;
+  base::SplitString(value, ',', &modules);
 
   size_t plugins_to_register = modules.size();
   if (plugins_to_register > kMaxPluginsToRegisterFromCommandLine) {
     DVLOG(1) << plugins_to_register << " pepper plugins registered from"
              << " command line which exceeds the limit (maximum "
              << kMaxPluginsToRegisterFromCommandLine << " plugins allowed)";
     plugins_to_register = kMaxPluginsToRegisterFromCommandLine;
   }
 
   for (size_t i = 0; i < plugins_to_register; ++i) {
-    std::vector<std::string> parts = base::SplitString(
-        modules[i], ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> parts;
+    base::SplitString(modules[i], ';', &parts);
     if (parts.size() < 2) {
       DVLOG(1) << "Required mime-type not found";
       continue;
     }
 
-    std::vector<std::string> name_parts = base::SplitString(
-        parts[0], "#", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> name_parts;
+    base::SplitString(parts[0], '#', &name_parts);
 
     PepperPluginInfo plugin;
     plugin.is_out_of_process = out_of_process;
 #if defined(OS_WIN)
     // This means we can't provide plugins from non-ASCII paths, but
     // since this switch is only for development I don't think that's
     // too awful.
     plugin.path = base::FilePath(base::ASCIIToUTF16(name_parts[0]));
 #else
     plugin.path = base::FilePath(name_parts[0]);
@@ skipping 54 matching lines @@
 
   return true;
 }
 
 void ComputePepperPluginList(std::vector<PepperPluginInfo>* plugins) {
   GetContentClient()->AddPepperPlugins(plugins);
   ComputePluginsFromCommandLine(plugins);
 }
 
 }  // namespace content