[6] Moves CreateVersionFromString to plugin_utils and updates the callers.

webkit/plugins/webplugininfo.cc

 // Copyright (c) 2011 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/plugins/webplugininfo.h"
 
 #include "base/logging.h"
+#include "base/string_split.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
 namespace webkit {
 
 WebPluginMimeType::WebPluginMimeType() {}
 
 WebPluginMimeType::WebPluginMimeType(const std::string& m,
                                      const std::string& f,
                                      const std::string& d)
     : mime_type(m),
@@ skipping 38 matching lines @@
                              const string16& fake_desc)
     : name(fake_name),
       path(fake_path),
       version(fake_version),
       desc(fake_desc),
       mime_types(),
       type(PLUGIN_TYPE_NPAPI),
       pepper_permissions(0) {
 }
 
+/* static */
+void WebPluginInfo::CreateVersionFromString(const string16& version_string,
+                                          Version* parsed_version) {
+  // Remove spaces and ')' from the version string,
+  // Replace any instances of 'r', ',' or '(' with a dot.
+  std::string version = UTF16ToASCII(version_string);
+  RemoveChars(version, ") ", &version);
+  std::replace(version.begin(), version.end(), 'd', '.');
+  std::replace(version.begin(), version.end(), 'r', '.');
+  std::replace(version.begin(), version.end(), ',', '.');
+  std::replace(version.begin(), version.end(), '(', '.');
+  std::replace(version.begin(), version.end(), '_', '.');
+
+  // Remove leading zeros from each of the version components.
+  std::string no_leading_zeros_version;
+  std::vector<std::string> numbers;
+  base::SplitString(version, '.', &numbers);
+  for (size_t i = 0; i < numbers.size(); ++i) {
+    size_t n = numbers[i].size();
+    size_t j = 0;
+    while (j < n && numbers[i][j] == '0') {
+      ++j;
+    }
+    no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0";
+    if (i != numbers.size() - 1) {
+      no_leading_zeros_version += ".";
+    }
+  }
+
+  *parsed_version = Version(no_leading_zeros_version);
+}
+
 bool IsPepperPlugin(const WebPluginInfo& plugin) {
   return ((plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS ) ||
           (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) ||
           (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED));
 }
 
 bool IsOutOfProcessPlugin(const WebPluginInfo& plugin) {
   return ((plugin.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) ||
           (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) ||
           (plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED));
 }
 
 }  // namespace webkit