//dbus: Convert base::(U)Int(64)ToString(16) to NumberToString(16)

The former non-overloaded variants are deprecated.

This is a mechanical change; there is no intended behavior change.

Bug: 929827
Change-Id: I2fae8217f120f3c8ded26d6466b888d89d9fda64
Reviewed-on: https://chromium-review.googlesource.com/c/1459617
Auto-Submit: Raul Tambre <raul@tambre.ee>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630121}

dbus/message.cc

@@ -33,7 +33,7 @@ void AppendUint32Header(const std::string& header_name,
                         uint32_t header_value,
                         std::string* output) {
   if (header_value != 0) {
-    *output += (header_name + ": " + base::UintToString(header_value) + "\n");
+    *output += (header_name + ": " + base::NumberToString(header_value) + "\n");
   }
 }
 
@@ -94,7 +94,7 @@ std::string Message::ToStringInternal(const std::string& indent,
         uint8_t value = 0;
         if (!reader->PopByte(&value))
           return kBrokenMessage;
-        output += indent + "byte " + base::UintToString(value) + "\n";
+        output += indent + "byte " + base::NumberToString(value) + "\n";
         break;
       }
       case BOOL: {
@@ -108,35 +108,35 @@ std::string Message::ToStringInternal(const std::string& indent,
         int16_t value = 0;
         if (!reader->PopInt16(&value))
           return kBrokenMessage;
-        output += indent + "int16_t " + base::IntToString(value) + "\n";
+        output += indent + "int16_t " + base::NumberToString(value) + "\n";
         break;
       }
       case UINT16: {
         uint16_t value = 0;
         if (!reader->PopUint16(&value))
           return kBrokenMessage;
-        output += indent + "uint16_t " + base::UintToString(value) + "\n";
+        output += indent + "uint16_t " + base::NumberToString(value) + "\n";
         break;
       }
       case INT32: {
         int32_t value = 0;
         if (!reader->PopInt32(&value))
           return kBrokenMessage;
-        output += indent + "int32_t " + base::IntToString(value) + "\n";
+        output += indent + "int32_t " + base::NumberToString(value) + "\n";
         break;
       }
       case UINT32: {
         uint32_t value = 0;
         if (!reader->PopUint32(&value))
           return kBrokenMessage;
-        output += indent + "uint32_t " + base::UintToString(value) + "\n";
+        output += indent + "uint32_t " + base::NumberToString(value) + "\n";
         break;
       }
       case INT64: {
         int64_t value = 0;
         if (!reader->PopInt64(&value))
           return kBrokenMessage;
-        output += (indent + "int64_t " + base::Int64ToString(value) + "\n");
+        output += (indent + "int64_t " + base::NumberToString(value) + "\n");
         break;
       }
       case UINT64: {
@@ -219,7 +219,7 @@ std::string Message::ToStringInternal(const std::string& indent,
         if (!reader->PopFileDescriptor(&file_descriptor))
           return kBrokenMessage;
         output +=
-            indent + "fd#" + base::IntToString(file_descriptor.get()) + "\n";
+            indent + "fd#" + base::NumberToString(file_descriptor.get()) + "\n";
         break;
       }
       default:

dbus/property_unittest.cc

@@ -341,7 +341,7 @@ TEST(PropertyTestStatic, ReadWriteStringMap) {
   for (unsigned i = 0; i < base::size(items); ++i) {
     variant_array_writer.OpenDictEntry(&struct_entry_writer);
     struct_entry_writer.AppendString(items[i]);
-    struct_entry_writer.AppendString(base::UintToString(i + 1));
+    struct_entry_writer.AppendString(base::NumberToString(i + 1));
     variant_array_writer.CloseContainer(&struct_entry_writer);
   }
   variant_writer.CloseContainer(&variant_array_writer);