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

3 files changed, 11 insertions, 8 deletions

diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm
index 0b24762..1dcb37a 100644
--- a/chrome/browser/cocoa/about_window_controller.mm
+++ b/chrome/browser/cocoa/about_window_controller.mm
@@ -8,6 +8,7 @@
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_list.h"
@@ -452,7 +453,7 @@ static BOOL recentShownUserActionFailedStatus = NO;
       // just to get the throbber to stop spinning if it's running.
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
 
       break;
 
@@ -550,14 +551,14 @@ static BOOL recentShownUserActionFailedStatus = NO;
       // just to get the throbber to stop spinning if it's running.
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
 
       break;
 
     case kAutoupdateRegisterFailed:
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
       enablePromoteButton = false;
 
       break;
@@ -565,7 +566,7 @@ static BOOL recentShownUserActionFailedStatus = NO;
     case kAutoupdateCheckFailed:
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
 
       break;
 
@@ -574,7 +575,7 @@ static BOOL recentShownUserActionFailedStatus = NO;
 
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
 
       // Allow another chance.
       enableUpdateButton = true;
@@ -586,7 +587,7 @@ static BOOL recentShownUserActionFailedStatus = NO;
 
       imageID = IDR_UPDATE_FAIL;
       message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR,
-                                                 IntToString16(status));
+                                                 base::IntToString16(status));
 
       break;
 
diff --git a/chrome/browser/cocoa/history_menu_bridge.mm b/chrome/browser/cocoa/history_menu_bridge.mm
index 7795bf7..d75043e 100644
--- a/chrome/browser/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/cocoa/history_menu_bridge.mm
@@ -8,6 +8,7 @@
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_HISTORY_MENU
@@ -207,7 +208,7 @@ void HistoryMenuBridge::TabRestoreServiceChanged(TabRestoreService* service) {
       } else {
         item->title =l10n_util::GetStringFUTF16(
             IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE,
-                IntToString16(item->tabs.size()));
+                base::IntToString16(item->tabs.size()));
       }
 
       // Sometimes it is possible for there to not be any subitems for a given
diff --git a/chrome/browser/cocoa/page_info_window_mac_unittest.mm b/chrome/browser/cocoa/page_info_window_mac_unittest.mm
index ab9fdbe..2bbaf24 100644
--- a/chrome/browser/cocoa/page_info_window_mac_unittest.mm
+++ b/chrome/browser/cocoa/page_info_window_mac_unittest.mm
@@ -5,6 +5,7 @@
 #include "app/l10n_util.h"
 #include "base/scoped_nsobject.h"
 #include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/page_info_window_mac.h"
 #import "chrome/browser/cocoa/page_info_window_controller.h"
@@ -170,7 +171,7 @@ TEST_F(PageInfoWindowMacTest, NoHistoryMixedSecurity) {
           l10n_util::GetStringFUTF16(
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
               ASCIIToUTF16("chrome.google.com"),
-              IntToString16(1024)),
+              base::IntToString16(1024)),
           l10n_util::GetStringUTF16(
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING)));