Move the number conversions from string_util to a new file....

webkit/glue/plugins/plugin_list_win.cc

 // Copyright (c) 2009 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/glue/plugins/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
 
 const TCHAR kRegistryApps[] =
     _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths");
 const TCHAR kRegistryFirefox[] = _T("firefox.exe");
@@ skipping 279 matching lines @@
   SplitString(b, ',', &b_ver);
   if (a_ver.size() == 1 && b_ver.size() == 1) {
     a_ver.clear();
     b_ver.clear();
     SplitString(a, '.', &a_ver);
     SplitString(b, '.', &b_ver);
   }
   if (a_ver.size() != b_ver.size())
     return false;
   for (size_t i = 0; i < a_ver.size(); i++) {
-    int cur_a = StringToInt(a_ver[i]);
-    int cur_b = StringToInt(b_ver[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;
     if (cur_a < cur_b)
       return true;
   }
   return false;
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   std::vector<WebPluginInfo>* plugins) {
@@ skipping 35 matching lines @@
   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<std::wstring> ver;
     SplitString(info.version, '.', &ver);
     int major, minor, update;
     if (ver.size() == 4 &&
-        StringToInt(ver[0], &major) &&
-        StringToInt(ver[1], &minor) &&
-        StringToInt(ver[2], &update)) {
+        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.
     }
   }
 
   // Special WMP handling
 
   // If both the new and old WMP plugins exist, only load the new one.
   if (filename == kNewWMPPlugin) {
     if (dont_load_new_wmp_)
       return false;
 
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
         plugins->erase(plugins->begin() + i);
         break;
       }
     }
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace NPAPI