Move the number conversions from string_util to a new file.

Use the base namespace in the new file. Update callers.

I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling.

TEST=included unit tests
BUG=none

Review URL: http://codereview.chromium.org/3056029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 31 insertions, 22 deletions

diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index 82e5e3a..b39943f 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "webkit/glue/dom_operations.h"
+
 #include <set>
 
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAnimationController.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
@@ -17,7 +19,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/dom_operations.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/webpasswordautocompletelistener_impl.h"
@@ -405,7 +406,7 @@ static int ParseSingleIconSize(const string16& text) {
       return 0;
   }
   int output;
-  if (!StringToInt(text, &output))
+  if (!base::StringToInt(text, &output))
     return 0;
   return output;
 }
diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index 0b37050..f7ba56f 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -5,6 +5,7 @@
 #include "webkit/glue/multipart_response_delegate.h"
 
 #include "base/logging.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
@@ -363,9 +364,9 @@ bool MultipartResponseDelegate::ReadContentRanges(
       content_range.substr(byte_range_upper_bound_start_offset,
                            byte_range_upper_bound_characters);
 
-  if (!StringToInt(byte_range_lower_bound, content_range_lower_bound))
+  if (!base::StringToInt(byte_range_lower_bound, content_range_lower_bound))
     return false;
-  if (!StringToInt(byte_range_upper_bound, content_range_upper_bound))
+  if (!base::StringToInt(byte_range_upper_bound, content_range_upper_bound))
     return false;
   return true;
 }
diff --git a/webkit/glue/plugins/pepper_var.cc b/webkit/glue/plugins/pepper_var.cc
index 414df7b..78e9479 100644
--- a/webkit/glue/plugins/pepper_var.cc
+++ b/webkit/glue/plugins/pepper_var.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "third_party/ppapi/c/pp_var.h"
 #include "third_party/ppapi/c/ppb_var.h"
@@ -200,7 +201,7 @@ PP_Var NPIdentifierToPPVarString(NPIdentifier id) {
   if (var.type == PP_VARTYPE_STRING)
     return var;
   DCHECK(var.type == PP_VARTYPE_INT32);
-  const std::string& str = IntToString(var.value.as_int);
+  const std::string& str = base::IntToString(var.value.as_int);
   return VarFromUtf8(str.data(), str.size());
 }
 
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 8506623..f7b3bf7 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/plugin_host.h"
@@ -489,13 +489,13 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) {
   std::string range_info = "bytes=";
 
   while (range_list) {
-    range_info += IntToString(range_list->offset);
-    range_info += "-";
-    range_info += IntToString(range_list->offset + range_list->length - 1);
+    range_info += base::IntToString(range_list->offset);
+    range_info.push_back('-');
+    range_info +=
+        base::IntToString(range_list->offset + range_list->length - 1);
     range_list = range_list->next;
-    if (range_list) {
-      range_info += ",";
-    }
+    if (range_list)
+      range_info.push_back(',');
   }
 
   if (plugin_data_stream_) {
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc
index 1c91916..9821928 100644
--- a/webkit/glue/plugins/plugin_list_win.cc
+++ b/webkit/glue/plugins/plugin_list_win.cc
@@ -14,6 +14,7 @@
 #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"
@@ -313,8 +314,10 @@ bool IsNewerVersion(const std::wstring& a, const std::wstring& b) {
   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)
@@ -370,9 +373,9 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
     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.
     }
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index 09184ab..df75cc0 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -15,6 +15,7 @@
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/stats_counters.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "skia/ext/platform_canvas.h"
@@ -285,7 +286,8 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
     std::vector<std::wstring> version;
     SplitString(plugin_info.version, L'.', &version);
     if (version.size() > 0) {
-      int major = static_cast<int>(StringToInt64(version[0]));
+      int major;
+      base::StringToInt(version[0], &major);
       if (major >= 9) {
         quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
 
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index cfc197b..7e4c871 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -18,6 +18,7 @@
 #include "base/platform_file.h"
 #include "base/singleton.h"
 #include "base/stats_counters.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -307,7 +308,7 @@ WebString WebKitClientImpl::queryLocalizedString(
   if (message_id < 0)
     return WebString();
   return ReplaceStringPlaceholders(GetLocalizedString(message_id),
-                                   IntToString16(numeric_value),
+                                   base::IntToString16(numeric_value),
                                    NULL);
 }