Add base::SizeTToString.

Change some users of base::Uint64ToString to base::SizeTToString.

R=brettw@chromium.org,rlarocque@chromium.org

Review URL: https://codereview.chromium.org/353693005

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

5 files changed, 39 insertions, 11 deletions

diff --git a/base/strings/string_number_conversions.cc b/base/strings/string_number_conversions.cc
index 59dc93b..d6bd5c4 100644
--- a/base/strings/string_number_conversions.cc
+++ b/base/strings/string_number_conversions.cc
@@ -388,8 +388,7 @@ string16 UintToString16(unsigned int value) {
 }
 
 std::string Int64ToString(int64 value) {
-  return IntToStringT<std::string, int64, uint64, true>::
-      IntToString(value);
+  return IntToStringT<std::string, int64, uint64, true>::IntToString(value);
 }
 
 string16 Int64ToString16(int64 value) {
@@ -397,13 +396,19 @@ string16 Int64ToString16(int64 value) {
 }
 
 std::string Uint64ToString(uint64 value) {
-  return IntToStringT<std::string, uint64, uint64, false>::
-      IntToString(value);
+  return IntToStringT<std::string, uint64, uint64, false>::IntToString(value);
 }
 
 string16 Uint64ToString16(uint64 value) {
-  return IntToStringT<string16, uint64, uint64, false>::
-      IntToString(value);
+  return IntToStringT<string16, uint64, uint64, false>::IntToString(value);
+}
+
+std::string SizeTToString(size_t value) {
+  return IntToStringT<std::string, size_t, size_t, false>::IntToString(value);
+}
+
+string16 SizeTToString16(size_t value) {
+  return IntToStringT<string16, size_t, size_t, false>::IntToString(value);
 }
 
 std::string DoubleToString(double value) {
diff --git a/base/strings/string_number_conversions.h b/base/strings/string_number_conversions.h
index 6f5df4a..050e627 100644
--- a/base/strings/string_number_conversions.h
+++ b/base/strings/string_number_conversions.h
@@ -41,6 +41,9 @@ BASE_EXPORT string16 Int64ToString16(int64 value);
 BASE_EXPORT std::string Uint64ToString(uint64 value);
 BASE_EXPORT string16 Uint64ToString16(uint64 value);
 
+BASE_EXPORT std::string SizeTToString(size_t value);
+BASE_EXPORT string16 SizeTToString16(size_t value);
+
 // DoubleToString converts the double to a string format that ignores the
 // locale. If you want to use locale specific formatting, use ICU.
 BASE_EXPORT std::string DoubleToString(double value);
diff --git a/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc
index b6e5f96..271c6bb 100644
--- a/base/strings/string_number_conversions_unittest.cc
+++ b/base/strings/string_number_conversions_unittest.cc
@@ -77,6 +77,29 @@ TEST(StringNumberConversionsTest, Uint64ToString) {
     EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input));
 }
 
+TEST(StringNumberConversionsTest, SizeTToString) {
+  size_t size_t_max = std::numeric_limits<size_t>::max();
+  std::string size_t_max_string = StringPrintf("%" PRIuS, size_t_max);
+
+  static const struct {
+    size_t input;
+    std::string output;
+  } cases[] = {
+    {0, "0"},
+    {9, "9"},
+    {42, "42"},
+    {INT_MAX, "2147483647"},
+    {2147483648U, "2147483648"},
+#if SIZE_MAX > 4294967295U
+    {99999999999U, "99999999999"},
+#endif
+    {size_t_max, size_t_max_string},
+  };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i)
+    EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input));
+}
+
 TEST(StringNumberConversionsTest, StringToInt) {
   static const struct {
     std::string input;
@@ -337,7 +360,6 @@ TEST(StringNumberConversionsTest, StringToUint64) {
 }
 
 TEST(StringNumberConversionsTest, StringToSizeT) {
-
   size_t size_t_max = std::numeric_limits<size_t>::max();
   std::string size_t_max_string = StringPrintf("%" PRIuS, size_t_max);
 
diff --git a/sync/internal_api/js_mutation_event_observer.cc b/sync/internal_api/js_mutation_event_observer.cc
index 3f1056f..b40693b 100644
--- a/sync/internal_api/js_mutation_event_observer.cc
+++ b/sync/internal_api/js_mutation_event_observer.cc
@@ -66,8 +66,7 @@ void JsMutationEventObserver::OnChangesApplied(
   } else {
     changes_value =
         new base::StringValue(
-            base::Uint64ToString(static_cast<uint64>(changes_size)) +
-            " changes");
+            base::SizeTToString(changes_size) + " changes");
   }
   details.Set("changes", changes_value);
   HandleJsEvent(FROM_HERE, "onChangesApplied", JsEventDetails(&details));
diff --git a/sync/syncable/write_transaction_info.cc b/sync/syncable/write_transaction_info.cc
index 3f69da8..a8a2327 100644
--- a/sync/syncable/write_transaction_info.cc
+++ b/sync/syncable/write_transaction_info.cc
@@ -37,8 +37,7 @@ base::DictionaryValue* WriteTransactionInfo::ToValue(
   } else {
     mutations_value =
         new base::StringValue(
-            base::Uint64ToString(static_cast<uint64>(mutations_size)) +
-            " mutations");
+            base::SizeTToString(mutations_size) + " mutations");
   }
   dict->Set("mutations", mutations_value);
   return dict;