Update SplitString calls to new form

content/common/plugin_list_win.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 <set>
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
@@ skipping 219 matching lines @@
         return true;
     }
   }
 
   return false;
 }
 
 // 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, b_ver;
-  base::SplitString(a, ',', &a_ver);
-  base::SplitString(b, ',', &b_ver);
+  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);
   if (a_ver.size() == 1 && b_ver.size() == 1) {
-    base::SplitString(a, '.', &a_ver);
-    base::SplitString(b, '.', &b_ver);
+    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);
   }
   if (a_ver.size() != b_ver.size())
     return false;
   for (size_t i = 0; i < a_ver.size(); i++) {
     int cur_a, cur_b;
     base::StringToInt(a_ver[i], &cur_a);
     base::StringToInt(b_ver[i], &cur_b);
 
     if (cur_a > cur_b)
       return false;
@@ skipping 179 matching lines @@
   // Disable the WangWang protocol handler plugin (npww.dll) as it crashes
   // chrome during shutdown. Firefox also disables this plugin.
   // Please refer to http://code.google.com/p/chromium/issues/detail?id=3953
   // for more information.
   if (filename == kWanWangProtocolHandlerPlugin)
     return false;
 
   // 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, '.', &ver);
+    std::vector<base::FilePath::StringType> ver = base::SplitString(
+        info.version, base::FilePath::StringType(1, '.'),
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     int major, minor, update;
     if (ver.size() == 4 &&
         base::StringToInt(ver[0], &major) &&
         base::StringToInt(ver[1], &minor) &&
         base::StringToInt(ver[2], &update)) {
       if (major == 6 && minor == 0 && update < 120)
         return false;  // Java SE6 Update 11 or older.
     }
   }
 
@@ skipping 21 matching lines @@
     return false;
 #else
   // The plugin in question could be a 64 bit plugin which we cannot load.
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
 }  // namespace content