Revert of Update SplitString calls to new form

content/common/plugin_list_win.cc

Index: content/common/plugin_list_win.cc
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index 98694a2466c0abfef3566c55f2e2e288fc4717a8..6c95a0db006b7dfc9a7edc92e76feb946c0c6db7 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -237,15 +237,12 @@
 // Compares Windows style version strings (i.e. 1,2,3,4).  Returns true if b's
 // version is newer than a's, or false if it's equal or older.
 bool IsNewerVersion(const base::string16& a, const base::string16& b) {
-  std::vector<base::string16> a_ver = base::SplitString(
-      a, base::string16(1, ','), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-  std::vector<base::string16> b_ver = base::SplitString(
-      b, base::string16(1, ','), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<base::string16> a_ver, b_ver;
+  base::SplitString(a, ',', &a_ver);
+  base::SplitString(b, ',', &b_ver);
   if (a_ver.size() == 1 && b_ver.size() == 1) {
-    a_ver = base::SplitString(
-        a, base::string16(1, '.'), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-    b_ver = base::SplitString(
-        b, base::string16(1, '.'), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    base::SplitString(a, '.', &a_ver);
+    base::SplitString(b, '.', &b_ver);
   }
   if (a_ver.size() != b_ver.size())
     return false;
@@ -445,9 +442,8 @@
   // We only work with newer versions of the Java plugin which use NPAPI only
   // and don't depend on XPCOM.
   if (filename == kJavaPlugin1 || filename == kJavaPlugin2) {
-    std::vector<base::FilePath::StringType> ver = base::SplitString(
-        info.version, base::FilePath::StringType(1, '.'),
-        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<base::FilePath::StringType> ver;
+    base::SplitString(info.version, '.', &ver);
     int major, minor, update;
     if (ver.size() == 4 &&
         base::StringToInt(ver[0], &major) &&