Convert more callers of the integer/string functions to using

string_number_conversions.h

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3013046

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

5 files changed, 25 insertions, 13 deletions

diff --git a/chrome/installer/util/compat_checks.cc b/chrome/installer/util/compat_checks.cc
index 2eaa2dd..3c13b21 100644
--- a/chrome/installer/util/compat_checks.cc
+++ b/chrome/installer/util/compat_checks.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2006-2009 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.
 
 #include "chrome/installer/util/compat_checks.h"
 
 #include "base/registry.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 
 namespace {
@@ -27,11 +28,11 @@ bool ParseSEPVersion(const std::wstring& version, int* v0, int* v1, int* v2) {
   SplitString(version, L'.', &v);
   if (v.size() != 4)
     return false;
-  if (!StringToInt(v[0], v0))
+  if (!base::StringToInt(v[0], v0))
     return false;
-  if (!StringToInt(v[1], v1))
+  if (!base::StringToInt(v[1], v1))
     return false;
-  if (!StringToInt(v[2], v2))
+  if (!base::StringToInt(v[2], v2))
     return false;
   return true;
 }
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index d3ee31a..15e1d2a 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -18,6 +18,7 @@
 #include "base/rand_util.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
@@ -131,7 +132,7 @@ int GetDirectoryWriteAgeInHours(const wchar_t* path) {
 bool RelaunchSetup(const std::wstring& flag, int value,
                    bool system_level_toast) {
   CommandLine cmd_line(CommandLine::ForCurrentProcess()->GetProgram());
-  cmd_line.AppendSwitchASCII(WideToASCII(flag), IntToString(value));
+  cmd_line.AppendSwitchASCII(WideToASCII(flag), base::IntToString(value));
   if (system_level_toast)
     cmd_line.AppendSwitch(
       WideToASCII(installer_util::switches::kSystemLevelToast));
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 36f6f1d..e56f1c6 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -4,8 +4,11 @@
 
 #include "chrome/installer/util/google_update_settings.h"
 
+#include <algorithm>
+
 #include "base/command_line.h"
 #include "base/registry.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/common/chrome_switches.h"
@@ -101,17 +104,17 @@ int GoogleUpdateSettings::GetLastRunTime() {
   if (!ReadGoogleUpdateStrKey(google_update::kRegLastRunTimeField, &time_s))
     return -1;
   int64 time_i;
-  if (!StringToInt64(time_s, &time_i))
+  if (!base::StringToInt64(time_s, &time_i))
     return -1;
   base::TimeDelta td =
-    base::Time::NowFromSystemTime() - base::Time::FromInternalValue(time_i);
+      base::Time::NowFromSystemTime() - base::Time::FromInternalValue(time_i);
   return td.InDays();
 }
 
 bool GoogleUpdateSettings::SetLastRunTime() {
   int64 time = base::Time::NowFromSystemTime().ToInternalValue();
   return WriteGoogleUpdateStrKey(google_update::kRegLastRunTimeField,
-                                 Int64ToWString(time));
+                                 base::Int64ToString16(time));
 }
 
 bool GoogleUpdateSettings::RemoveLastRunTime() {
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index dda1d1e..a8908c84 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 //
@@ -19,6 +19,7 @@
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_constants.h"
@@ -502,7 +503,7 @@ std::wstring ShellUtil::GetChromeIcon(const std::wstring& chrome_exe) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring chrome_icon(chrome_exe);
   chrome_icon.append(L",");
-  chrome_icon.append(IntToWString(dist->GetIconIndex()));
+  chrome_icon.append(base::IntToString16(dist->GetIconIndex()));
   return chrome_icon;
 }
 
diff --git a/chrome/installer/util/version.cc b/chrome/installer/util/version.cc
index 6dfc205..94bc9c3 100644
--- a/chrome/installer/util/version.cc
+++ b/chrome/installer/util/version.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/installer/util/version.h"
+
 #include <vector>
 
 #include "base/format_macros.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "chrome/installer/util/version.h"
 
 installer::Version::Version(int64 major, int64 minor, int64 build,
                             int64 patch)
@@ -42,6 +44,10 @@ installer::Version* installer::Version::GetVersionFromString(
     return NULL;
   }
 
-  return new Version(StringToInt64(numbers[0]), StringToInt64(numbers[1]),
-                     StringToInt64(numbers[2]), StringToInt64(numbers[3]));
+  int64 v0, v1, v2, v3;
+  base::StringToInt64(numbers[0], &v0);
+  base::StringToInt64(numbers[1], &v1);
+  base::StringToInt64(numbers[2], &v2);
+  base::StringToInt64(numbers[3], &v3);
+  return new Version(v0, v1, v2, v3);
 }