diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index 7202c9e2d22a5b..7d2e18a5829952 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -172,7 +172,7 @@ base::string16 AccessibilityTreeFormatterAndroid::ProcessTreeForOutput(
   if (show_ids()) {
     int id_value;
     dict.GetInteger("id", &id_value);
-    WriteAttribute(true, base::IntToString16(id_value), &line);
+    WriteAttribute(true, base::NumberToString16(id_value), &line);
   }
 
   base::string16 class_value;
diff --git a/content/browser/accessibility/accessibility_tree_formatter_blink.cc b/content/browser/accessibility/accessibility_tree_formatter_blink.cc
index 05f47a439a4970..8dbd3a3ad9a12f 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_blink.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_blink.cc
@@ -306,7 +306,7 @@ base::string16 AccessibilityTreeFormatterBlink::ProcessTreeForOutput(
   if (show_ids()) {
     int id_value;
     dict.GetInteger("id", &id_value);
-    WriteAttribute(true, base::IntToString16(id_value), &line);
+    WriteAttribute(true, base::NumberToString16(id_value), &line);
   }
 
   base::string16 role_value;
@@ -434,7 +434,7 @@ base::string16 AccessibilityTreeFormatterBlink::ProcessTreeForOutput(
       } else {
         int int_value;
         value->GetInteger(i, &int_value);
-        attr_string += base::IntToString(int_value);
+        attr_string += base::NumberToString(int_value);
       }
     }
     WriteAttribute(false, attr_string, &line);
diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
index 2f36e17bdb4026..a36d69e57be100 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
@@ -286,7 +286,7 @@ void AddProperties(const BrowserAccessibility& node,
   if (show_ids()) {
     int id_value;
     dict.GetInteger("id", &id_value);
-    WriteAttribute(true, base::IntToString16(id_value), &line);
+    WriteAttribute(true, base::NumberToString16(id_value), &line);
   }
 
   NSArray* defaultAttributes =
diff --git a/content/browser/accessibility/accessibility_tree_formatter_stub.cc b/content/browser/accessibility/accessibility_tree_formatter_stub.cc
index 61a74486433d40..cb7bb0a4d26c4c 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_stub.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_stub.cc
@@ -50,7 +50,7 @@ base::string16 AccessibilityTreeFormatterStub::ProcessTreeForOutput(
     base::DictionaryValue* filtered_dict_result) {
   int id_value;
   node.GetInteger("id", &id_value);
-  return base::IntToString16(id_value);
+  return base::NumberToString16(id_value);
 }
 
 const base::FilePath::StringType
diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/accessibility_tree_formatter_win.cc
index 14c65377c127aa..fa5b650beef26e 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_win.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_win.cc
@@ -822,7 +822,7 @@ void AccessibilityTreeFormatterWin::AddIA2TextProperties(
     if (hr == S_OK && temp_bstr && wcslen(temp_bstr)) {
       // Append offset:<number>.
       base::string16 offset_str =
-          base::ASCIIToUTF16("offset:") + base::IntToString16(start_offset);
+          base::ASCIIToUTF16("offset:") + base::NumberToString16(start_offset);
       text_attributes->AppendString(offset_str);
       // Append name:value pairs.
       std::vector<base::string16> name_val_pairs =
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc
index 46e928e6d4ce8d..ff6f11d2d08a1c 100644
--- a/content/browser/accessibility/accessibility_win_browsertest.cc
+++ b/content/browser/accessibility/accessibility_win_browsertest.cc
@@ -311,8 +311,8 @@ void AccessibilityWinBrowserTest::SetUpInputFieldHelper(
   AccessibilityNotificationWaiter waiter(
       shell()->web_contents(), ui::kAXModeComplete,
       ax::mojom::Event::kTextSelectionChanged);
-  std::wstring caret_offset = base::UTF16ToWide(
-      base::IntToString16(static_cast<int>(kContentsLength - 1)));
+  std::wstring caret_offset =
+      base::UTF16ToWide(base::NumberToString16(kContentsLength - 1));
   ExecuteScript(
       std::wstring(L"let textField = document.querySelector('input,textarea');"
                    L"textField.focus();"
@@ -369,8 +369,8 @@ void AccessibilityWinBrowserTest::SetUpTextareaField(
   AccessibilityNotificationWaiter waiter(
       shell()->web_contents(), ui::kAXModeComplete,
       ax::mojom::Event::kTextSelectionChanged);
-  std::wstring caret_offset = base::UTF16ToWide(
-      base::IntToString16(static_cast<int>(kContentsLength - 1)));
+  std::wstring caret_offset =
+      base::UTF16ToWide(base::NumberToString16(kContentsLength - 1));
   ExecuteScript(
       std::wstring(L"var textField = document.querySelector('textarea');"
                    L"textField.focus();"
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc
index f405ebbdd7e76d..8c5949b267f40b 100644
--- a/content/browser/accessibility/browser_accessibility_android.cc
+++ b/content/browser/accessibility/browser_accessibility_android.cc
@@ -531,7 +531,7 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
     int level = GetIntAttribute(ax::mojom::IntAttribute::kHierarchicalLevel);
     if (level >= 1 && level <= 6) {
       std::vector<base::string16> values;
-      values.push_back(base::IntToString16(level));
+      values.push_back(base::NumberToString16(level));
       return base::ReplaceStringPlaceholders(
           content_client->GetLocalizedString(IDS_AX_ROLE_HEADING_WITH_LEVEL),
           values, nullptr);
diff --git a/content/browser/accessibility/browser_accessibility_com_win.cc b/content/browser/accessibility/browser_accessibility_com_win.cc
index e82b0351caf347..1183e151b26936 100644
--- a/content/browser/accessibility/browser_accessibility_com_win.cc
+++ b/content/browser/accessibility/browser_accessibility_com_win.cc
@@ -1902,9 +1902,9 @@ std::vector<base::string16> BrowserAccessibilityComWin::ComputeTextAttributes()
     unsigned int blue = SkColorGetB(color);
     // Don't expose default value of pure white.
     if (alpha && (red != 255 || green != 255 || blue != 255)) {
-      base::string16 color_value = L"rgb(" + base::UintToString16(red) + L',' +
-                                   base::UintToString16(green) + L',' +
-                                   base::UintToString16(blue) + L')';
+      base::string16 color_value = L"rgb(" + base::NumberToString16(red) +
+                                   L',' + base::NumberToString16(green) + L',' +
+                                   base::NumberToString16(blue) + L')';
       SanitizeStringAttributeForIA2(color_value, &color_value);
       attributes.push_back(L"background-color:" + color_value);
     }
@@ -1916,9 +1916,9 @@ std::vector<base::string16> BrowserAccessibilityComWin::ComputeTextAttributes()
     unsigned int blue = SkColorGetB(color);
     // Don't expose default value of black.
     if (red || green || blue) {
-      base::string16 color_value = L"rgb(" + base::UintToString16(red) + L',' +
-                                   base::UintToString16(green) + L',' +
-                                   base::UintToString16(blue) + L')';
+      base::string16 color_value = L"rgb(" + base::NumberToString16(red) +
+                                   L',' + base::NumberToString16(green) + L',' +
+                                   base::NumberToString16(blue) + L')';
       SanitizeStringAttributeForIA2(color_value, &color_value);
       attributes.push_back(L"color:" + color_value);
     }
diff --git a/content/browser/accessibility/touch_accessibility_aura_browsertest.cc b/content/browser/accessibility/touch_accessibility_aura_browsertest.cc
index 0ec7810518f731..bbecb363704730 100644
--- a/content/browser/accessibility/touch_accessibility_aura_browsertest.cc
+++ b/content/browser/accessibility/touch_accessibility_aura_browsertest.cc
@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(TouchAccessibilityBrowserTest,
   for (int row = 0; row < 5; ++row) {
     html_url += "<tr>";
     for (int col = 0; col < 7; ++col) {
-      html_url += "<td>" + base::IntToString(cell) + "</td>";
+      html_url += "<td>" + base::NumberToString(cell) + "</td>";
       ++cell;
     }
     html_url += "</tr>";
@@ -98,7 +98,7 @@ IN_PROC_BROWSER_TEST_F(TouchAccessibilityBrowserTest,
       shell()->web_contents(), ui::kAXModeComplete, ax::mojom::Event::kHover);
   for (int row = 0; row < 5; ++row) {
     for (int col = 0; col < 7; ++col) {
-      std::string expected_cell_text = base::IntToString(row * 7 + col);
+      std::string expected_cell_text = base::NumberToString(row * 7 + col);
       VLOG(1) << "Sending event in row " << row << " col " << col
               << " with text " << expected_cell_text;
       SendTouchExplorationEvent(50 * col + 25, 50 * row + 25);
diff --git a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
index af827187dadb90..dabd66ba8c7211 100644
--- a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
+++ b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
@@ -106,10 +106,10 @@ jvalue CoerceJavaScriptIntegerToJavaValue(JNIEnv* env,
       result.l = NULL;
       break;
     case JavaType::TypeString:
-      result.l = coerce_to_string
-                     ? ConvertUTF8ToJavaString(
-                           env, base::Int64ToString(int_value)).Release()
-                     : NULL;
+      result.l = coerce_to_string ? ConvertUTF8ToJavaString(
+                                        env, base::NumberToString(int_value))
+                                        .Release()
+                                  : NULL;
       break;
     case JavaType::TypeBoolean:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to false. Spec
@@ -539,7 +539,7 @@ jobject CoerceJavaScriptDictionaryToArray(JNIEnv* env,
   }
   auto null_value = std::make_unique<base::Value>();
   for (jsize i = 0; i < length; ++i) {
-    const std::string key(base::IntToString(i));
+    const std::string key(base::NumberToString(i));
     const base::Value* value_element = null_value.get();
     if (dictionary_value->HasKey(key)) {
       dictionary_value->Get(key, &value_element);
diff --git a/content/browser/appcache/appcache_disk_cache.cc b/content/browser/appcache/appcache_disk_cache.cc
index 242bf8c88f18f8..d38e9ed58d5a52 100644
--- a/content/browser/appcache/appcache_disk_cache.cc
+++ b/content/browser/appcache/appcache_disk_cache.cc
@@ -119,7 +119,7 @@ class AppCacheDiskCache::ActiveCall
     scoped_refptr<ActiveCall> active_call(
         new ActiveCall(owner, entry, std::move(callback)));
     net::Error return_value = owner->disk_cache()->CreateEntry(
-        base::Int64ToString(key), net::HIGHEST, &active_call->entry_ptr_,
+        base::NumberToString(key), net::HIGHEST, &active_call->entry_ptr_,
         base::BindOnce(&ActiveCall::OnAsyncCompletion, active_call));
     return active_call->HandleImmediateReturnValue(return_value);
   }
@@ -131,7 +131,7 @@ class AppCacheDiskCache::ActiveCall
     scoped_refptr<ActiveCall> active_call(
         new ActiveCall(owner, entry, std::move(callback)));
     net::Error return_value = owner->disk_cache()->OpenEntry(
-        base::Int64ToString(key), net::HIGHEST, &active_call->entry_ptr_,
+        base::NumberToString(key), net::HIGHEST, &active_call->entry_ptr_,
         base::BindOnce(&ActiveCall::OnAsyncCompletion, active_call));
     return active_call->HandleImmediateReturnValue(return_value);
   }
@@ -142,7 +142,7 @@ class AppCacheDiskCache::ActiveCall
     scoped_refptr<ActiveCall> active_call(
         new ActiveCall(owner, nullptr, std::move(callback)));
     net::Error return_value = owner->disk_cache()->DoomEntry(
-        base::Int64ToString(key), net::HIGHEST,
+        base::NumberToString(key), net::HIGHEST,
         base::BindOnce(&ActiveCall::OnAsyncCompletion, active_call));
     return active_call->HandleImmediateReturnValue(return_value);
   }
diff --git a/content/browser/appcache/appcache_internals_ui.cc b/content/browser/appcache/appcache_internals_ui.cc
index f03f5472f99d32..d63844fe8e67c5 100644
--- a/content/browser/appcache/appcache_internals_ui.cc
+++ b/content/browser/appcache/appcache_internals_ui.cc
@@ -67,9 +67,9 @@ std::unique_ptr<base::DictionaryValue> GetDictionaryValueForResponseEnquiry(
       new base::DictionaryValue());
   dict_value->SetString("manifestURL", response_enquiry.manifest_url);
   dict_value->SetString("groupId",
-                        base::Int64ToString(response_enquiry.group_id));
+                        base::NumberToString(response_enquiry.group_id));
   dict_value->SetString("responseId",
-                        base::Int64ToString(response_enquiry.response_id));
+                        base::NumberToString(response_enquiry.response_id));
   return dict_value;
 }
 
@@ -86,7 +86,8 @@ std::unique_ptr<base::DictionaryValue> GetDictionaryValueForAppCacheInfo(
   dict_value->SetString(
       "size",
       base::UTF16ToUTF8(base::FormatBytesUnlocalized(appcache_info.size)));
-  dict_value->SetString("groupId", base::Int64ToString(appcache_info.group_id));
+  dict_value->SetString("groupId",
+                        base::NumberToString(appcache_info.group_id));
 
   return dict_value;
 }
@@ -120,7 +121,8 @@ GetDictionaryValueForAppCacheResourceInfo(
   dict->SetString(
       "size",
       base::UTF16ToUTF8(base::FormatBytesUnlocalized(resource_info.size)));
-  dict->SetString("responseId", base::Int64ToString(resource_info.response_id));
+  dict->SetString("responseId",
+                  base::NumberToString(resource_info.response_id));
   dict->SetBoolean("isExplicit", resource_info.is_explicit);
   dict->SetBoolean("isManifest", resource_info.is_manifest);
   dict->SetBoolean("isMaster", resource_info.is_master);
diff --git a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc
index 2b15ead14fc311..ace376ab55810e 100644
--- a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc
+++ b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc
@@ -973,7 +973,7 @@ TEST_F(BackgroundFetchDataManagerTest, RegistrationLimitIsEnforced) {
   for (int i = 0; i < 2; i++) {
     // First Service Worker.
     BackgroundFetchRegistrationId registration_id1(
-        swid1, origin(), kExampleDeveloperId + base::IntToString(i),
+        swid1, origin(), kExampleDeveloperId + base::NumberToString(i),
         base::GenerateGUID());
     CreateRegistration(
         registration_id1, std::vector<blink::mojom::FetchAPIRequestPtr>(),
@@ -982,7 +982,7 @@ TEST_F(BackgroundFetchDataManagerTest, RegistrationLimitIsEnforced) {
 
     // Second service Worker.
     BackgroundFetchRegistrationId registration_id2(
-        swid2, origin(), kExampleDeveloperId + base::IntToString(i),
+        swid2, origin(), kExampleDeveloperId + base::NumberToString(i),
         base::GenerateGUID());
     CreateRegistration(
         registration_id2, std::vector<blink::mojom::FetchAPIRequestPtr>(),
diff --git a/content/browser/background_fetch/background_fetch_test_base.cc b/content/browser/background_fetch/background_fetch_test_base.cc
index 301e3bb28ec2eb..7bc6a7efc538e1 100644
--- a/content/browser/background_fetch/background_fetch_test_base.cc
+++ b/content/browser/background_fetch/background_fetch_test_base.cc
@@ -68,7 +68,7 @@ void DidUnregisterServiceWorker(base::Closure quit_closure,
 }
 
 GURL GetScopeForId(const std::string& origin, int64_t id) {
-  return GURL(origin + base::IntToString(id));
+  return GURL(origin + base::NumberToString(id));
 }
 
 }  // namespace
diff --git a/content/browser/bad_message.cc b/content/browser/bad_message.cc
index e0a02d1808526a..80136c47dd0518 100644
--- a/content/browser/bad_message.cc
+++ b/content/browser/bad_message.cc
@@ -26,7 +26,8 @@ void LogBadMessage(BadMessageReason reason) {
 
   LOG(ERROR) << "Terminating renderer for bad IPC message, reason " << reason;
   base::UmaHistogramSparse("Stability.BadMessageTerminated.Content", reason);
-  base::debug::SetCrashKeyString(bad_message_reason, base::IntToString(reason));
+  base::debug::SetCrashKeyString(bad_message_reason,
+                                 base::NumberToString(reason));
 }
 
 void ReceivedBadMessageOnUIThread(int render_process_id,
diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc
index 35160299b629aa..688dc1911aa7ec 100644
--- a/content/browser/database_browsertest.cc
+++ b/content/browser/database_browsertest.cc
@@ -45,13 +45,13 @@ class DatabaseTest : public ContentBrowserTest {
   void UpdateRecord(Shell* shell, int index, const std::string& data) {
     RunScriptAndCheckResult(
         shell,
-        "updateRecord(" + base::IntToString(index) + ", '" + data + "')",
+        "updateRecord(" + base::NumberToString(index) + ", '" + data + "')",
         "done");
   }
 
   void DeleteRecord(Shell* shell, int index) {
     RunScriptAndCheckResult(
-        shell, "deleteRecord(" + base::IntToString(index) + ")", "done");
+        shell, "deleteRecord(" + base::NumberToString(index) + ")", "done");
   }
 
   void CompareRecords(Shell* shell, const std::string& expected) {
@@ -123,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(DatabaseTest, DatabaseOperations) {
 
   std::string expected;
   for (int i = 0; i < 10; ++i) {
-    std::string item = base::IntToString(i);
+    std::string item = base::NumberToString(i);
     InsertRecord(shell(), item);
     if (!expected.empty())
       expected += ", ";
@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(DatabaseTest, DatabaseOperations) {
 
   expected.clear();
   for (int i = 0; i < 10; ++i) {
-    std::string item = base::IntToString(i * i);
+    std::string item = base::NumberToString(i * i);
     UpdateRecord(shell(), i, item);
     if (!expected.empty())
       expected += ", ";
diff --git a/content/browser/devtools/devtools_io_context.cc b/content/browser/devtools/devtools_io_context.cc
index f7c4a2b6c5ebd1..c45fdfc76234b6 100644
--- a/content/browser/devtools/devtools_io_context.cc
+++ b/content/browser/devtools/devtools_io_context.cc
@@ -21,7 +21,7 @@ DevToolsIOContext::Stream::Stream(
 
 std::string DevToolsIOContext::Stream::Register(DevToolsIOContext* context) {
   static unsigned s_last_stream_handle = 0;
-  const std::string handle = base::UintToString(++s_last_stream_handle);
+  const std::string handle = base::NumberToString(++s_last_stream_handle);
   Register(context, handle);
   return handle;
 }
diff --git a/content/browser/devtools/protocol/emulation_handler.cc b/content/browser/devtools/protocol/emulation_handler.cc
index 8df358c3af970f..18b6e5468043cc 100644
--- a/content/browser/devtools/protocol/emulation_handler.cc
+++ b/content/browser/devtools/protocol/emulation_handler.cc
@@ -183,7 +183,7 @@ Response EmulationHandler::SetDeviceMetricsOverride(
       screen_height.fromMaybe(0) > max_size) {
     return Response::InvalidParams(
         "Screen width and height values must be positive, not greater than " +
-        base::IntToString(max_size));
+        base::NumberToString(max_size));
   }
 
   if (position_x.fromMaybe(0) < 0 || position_y.fromMaybe(0) < 0 ||
@@ -195,7 +195,7 @@ Response EmulationHandler::SetDeviceMetricsOverride(
   if (width < 0 || height < 0 || width > max_size || height > max_size) {
     return Response::InvalidParams(
         "Width and height values must be positive, not greater than " +
-        base::IntToString(max_size));
+        base::NumberToString(max_size));
   }
 
   if (device_scale_factor < 0)
@@ -219,7 +219,7 @@ Response EmulationHandler::SetDeviceMetricsOverride(
     if (orientationAngle < 0 || orientationAngle >= max_orientation_angle) {
       return Response::InvalidParams(
           "Screen orientation angle must be non-negative, less than " +
-          base::IntToString(max_orientation_angle));
+          base::NumberToString(max_orientation_angle));
     }
   }
 
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
index 19b4801eb85d90..3dc663a5499552 100644
--- a/content/browser/devtools/protocol/service_worker_handler.cc
+++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -364,7 +364,7 @@ void ServiceWorkerHandler::OnWorkerRegistrationUpdated(
   for (const auto& registration : registrations) {
     result->addItem(Registration::Create()
                         .SetRegistrationId(
-                            base::Int64ToString(registration.registration_id))
+                            base::NumberToString(registration.registration_id))
                         .SetScopeURL(registration.scope.spec())
                         .SetIsDeleted(registration.delete_flag ==
                                       ServiceWorkerRegistrationInfo::IS_DELETED)
@@ -404,20 +404,18 @@ void ServiceWorkerHandler::OnWorkerVersionUpdated(
     for (auto& c : client_set)
       clients->addItem(c);
 
-    std::unique_ptr<Version> version_value = Version::Create()
-        .SetVersionId(base::Int64ToString(version.version_id))
-        .SetRegistrationId(
-            base::Int64ToString(version.registration_id))
-        .SetScriptURL(version.script_url.spec())
-        .SetRunningStatus(
-            GetVersionRunningStatusString(version.running_status))
-        .SetStatus(GetVersionStatusString(version.status))
-        .SetScriptLastModified(
-            version.script_last_modified.ToDoubleT())
-        .SetScriptResponseTime(
-            version.script_response_time.ToDoubleT())
-        .SetControlledClients(std::move(clients))
-        .Build();
+    std::unique_ptr<Version> version_value =
+        Version::Create()
+            .SetVersionId(base::NumberToString(version.version_id))
+            .SetRegistrationId(base::NumberToString(version.registration_id))
+            .SetScriptURL(version.script_url.spec())
+            .SetRunningStatus(
+                GetVersionRunningStatusString(version.running_status))
+            .SetStatus(GetVersionStatusString(version.status))
+            .SetScriptLastModified(version.script_last_modified.ToDoubleT())
+            .SetScriptResponseTime(version.script_response_time.ToDoubleT())
+            .SetControlledClients(std::move(clients))
+            .Build();
     scoped_refptr<DevToolsAgentHostImpl> host(
         ServiceWorkerDevToolsManager::GetInstance()
             ->GetDevToolsAgentHostForWorker(
@@ -437,8 +435,8 @@ void ServiceWorkerHandler::OnErrorReported(
   frontend_->WorkerErrorReported(
       ServiceWorker::ServiceWorkerErrorMessage::Create()
           .SetErrorMessage(base::UTF16ToUTF8(info.error_message))
-          .SetRegistrationId(base::Int64ToString(registration_id))
-          .SetVersionId(base::Int64ToString(version_id))
+          .SetRegistrationId(base::NumberToString(registration_id))
+          .SetVersionId(base::NumberToString(version_id))
           .SetSourceURL(info.source_url.spec())
           .SetLineNumber(info.line_number)
           .SetColumnNumber(info.column_number)
diff --git a/content/browser/devtools/protocol_string.h b/content/browser/devtools/protocol_string.h
index 23144ca82c7b76..83cf9755af30da 100644
--- a/content/browser/devtools/protocol_string.h
+++ b/content/browser/devtools/protocol_string.h
@@ -45,9 +45,7 @@ class CONTENT_EXPORT StringUtil {
   static String substring(const String& s, unsigned pos, unsigned len) {
     return s.substr(pos, len);
   }
-  static String fromInteger(int number) {
-    return base::IntToString(number);
-  }
+  static String fromInteger(int number) { return base::NumberToString(number); }
   static String fromDouble(double number) {
     String s = base::NumberToString(number);
     if (!s.empty() && s[0] == '.')
diff --git a/content/browser/dom_storage/local_storage_context_mojo.cc b/content/browser/dom_storage/local_storage_context_mojo.cc
index 4915e0aca9f202..5067deca2f88d2 100644
--- a/content/browser/dom_storage/local_storage_context_mojo.cc
+++ b/content/browser/dom_storage/local_storage_context_mojo.cc
@@ -230,7 +230,7 @@ class LocalStorageContextMojo::StorageAreaHolder final
       item->type = leveldb::mojom::BatchOperationType::PUT_KEY;
       item->key = leveldb::StdStringToUint8Vector(kVersionKey);
       item->value = leveldb::StdStringToUint8Vector(
-          base::Int64ToString(kCurrentLocalStorageSchemaVersion));
+          base::NumberToString(kCurrentLocalStorageSchemaVersion));
       operations.push_back(std::move(item));
       context_->database_initialized_ = true;
     }
diff --git a/content/browser/dom_storage/session_storage_database.cc b/content/browser/dom_storage/session_storage_database.cc
index 4c660ab491765b..69c678a9d6f9ee 100644
--- a/content/browser/dom_storage/session_storage_database.cc
+++ b/content/browser/dom_storage/session_storage_database.cc
@@ -680,7 +680,7 @@ bool SessionStorageDatabase::CreateMapForArea(const std::string& namespace_id,
     if (!ConsistencyCheck(conversion_ok))
       return false;
   }
-  batch->Put(next_map_id_key, base::Int64ToString(++next_map_id));
+  batch->Put(next_map_id_key, base::NumberToString(++next_map_id));
   std::string namespace_key =
       NamespaceKey(namespace_id, origin.GetURL().spec());
   batch->Put(namespace_key, *map_id);
@@ -762,7 +762,7 @@ bool SessionStorageDatabase::IncreaseMapRefCount(const std::string& map_id,
   int64_t old_ref_count;
   if (!GetMapRefCount(map_id, &old_ref_count))
     return false;
-  batch->Put(MapRefCountKey(map_id), base::Int64ToString(++old_ref_count));
+  batch->Put(MapRefCountKey(map_id), base::NumberToString(++old_ref_count));
   return true;
 }
 
@@ -777,7 +777,7 @@ bool SessionStorageDatabase::DecreaseMapRefCount(const std::string& map_id,
     return false;
   ref_count -= decrease;
   if (ref_count > 0) {
-    batch->Put(MapRefCountKey(map_id), base::Int64ToString(ref_count));
+    batch->Put(MapRefCountKey(map_id), base::NumberToString(ref_count));
   } else {
     // Clear all keys in the map.
     if (!ClearMap(map_id, batch))
diff --git a/content/browser/dom_storage/storage_area_impl_unittest.cc b/content/browser/dom_storage/storage_area_impl_unittest.cc
index 73576753e550b5..fdf84c931c364e 100644
--- a/content/browser/dom_storage/storage_area_impl_unittest.cc
+++ b/content/browser/dom_storage/storage_area_impl_unittest.cc
@@ -1134,7 +1134,7 @@ TEST_P(StorageAreaImplParamTest, PrefixForkAfterLoad) {
 
 namespace {
 std::string GetNewPrefix(int* i) {
-  std::string prefix = "prefix-" + base::Int64ToString(*i) + "-";
+  std::string prefix = "prefix-" + base::NumberToString(*i) + "-";
   (*i)++;
   return prefix;
 }
diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index b0670742771c47..c19a8e1ac30e0d 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc
@@ -966,7 +966,7 @@ class ParallelDownloadTest : public DownloadContentTest {
     std::map<std::string, std::string> params = {
         {download::kMinSliceSizeFinchKey, "1"},
         {download::kParallelRequestCountFinchKey,
-         base::IntToString(kTestRequestCount)},
+         base::NumberToString(kTestRequestCount)},
         {download::kParallelRequestDelayFinchKey, "0"},
         {download::kParallelRequestRemainingTimeFinchKey, "0"}};
     scoped_feature_list_.InitAndEnableFeatureWithParameters(
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
index a91ec48853c625..ab829be62d5744 100644
--- a/content/browser/download/drag_download_util.cc
+++ b/content/browser/download/drag_download_util.cc
@@ -70,9 +70,9 @@ base::File CreateFileForDrop(base::FilePath* file_path) {
     } else {
 #if defined(OS_WIN)
       base::string16 suffix =
-          base::ASCIIToUTF16("-") + base::IntToString16(seq);
+          base::ASCIIToUTF16("-") + base::NumberToString16(seq);
 #else
-      std::string suffix = std::string("-") + base::IntToString(seq);
+      std::string suffix = std::string("-") + base::NumberToString(seq);
 #endif
       new_file_path = file_path->InsertBeforeExtension(suffix);
     }
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index 20c5bb3d137f2c..bb01795177278b 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -33,7 +33,7 @@ namespace {
 // Appends a description of the structure of the frame tree to |result|.
 void AppendTreeNodeState(FrameTreeNode* node, std::string* result) {
   result->append(
-      base::Int64ToString(node->current_frame_host()->GetRoutingID()));
+      base::NumberToString(node->current_frame_host()->GetRoutingID()));
   if (!node->current_frame_host()->IsRenderFrameLive())
     result->append("*");  // Asterisk next to dead frames.
 
@@ -139,7 +139,8 @@ class FrameTreeTest : public RenderViewHostImplTestHarness {
          frame_tree->NodesExceptSubtree(subtree_to_skip)) {
       if (!result.empty())
         result += " ";
-      result += base::Int64ToString(node->current_frame_host()->GetRoutingID());
+      result +=
+          base::NumberToString(node->current_frame_host()->GetRoutingID());
     }
     return result;
   }
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index c2d2c11af48826..3fa00d91b04f56 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -154,7 +154,7 @@ std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue(
   auto basic_info = std::make_unique<base::ListValue>();
   basic_info->Append(NewDescriptionValuePair(
       "Initialization time",
-      base::Int64ToString(gpu_info.initialization_time.InMilliseconds())));
+      base::NumberToString(gpu_info.initialization_time.InMilliseconds())));
   basic_info->Append(NewDescriptionValuePair(
       "In-process GPU",
       std::make_unique<base::Value>(gpu_info.in_process_gpu)));
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
index 145ffe72bc7151..e655c641db4df3 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -44,7 +44,7 @@
 #include "url/origin.h"
 
 using base::ASCIIToUTF16;
-using base::Int64ToString16;
+using base::NumberToString16;
 using blink::IndexedDBDatabaseMetadata;
 using blink::IndexedDBIndexKeys;
 using blink::IndexedDBIndexMetadata;
@@ -140,7 +140,7 @@ class IndexedDBDatabase::OpenRequest
         } else {
           message =
               ASCIIToUTF16("Internal error opening database with version ") +
-              Int64ToString16(pending_->version);
+              NumberToString16(pending_->version);
         }
         pending_->callbacks->OnError(IndexedDBDatabaseError(
             blink::kWebIDBDatabaseExceptionUnknownError, message));
@@ -190,9 +190,9 @@ class IndexedDBDatabase::OpenRequest
       pending_->callbacks->OnError(IndexedDBDatabaseError(
           blink::kWebIDBDatabaseExceptionVersionError,
           ASCIIToUTF16("The requested version (") +
-              Int64ToString16(pending_->version) +
+              NumberToString16(pending_->version) +
               ASCIIToUTF16(") is less than the existing version (") +
-              Int64ToString16(db_->metadata_.version) + ASCIIToUTF16(").")));
+              NumberToString16(db_->metadata_.version) + ASCIIToUTF16(").")));
       db_->RequestComplete(this);
       return;
     }
diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc
index 23948c779a2b74..3a596dc9ff08f3 100644
--- a/content/browser/media/capture/desktop_capture_device_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_unittest.cc
@@ -669,7 +669,7 @@ TEST_F(DesktopCaptureDeviceThrottledTest, Throttled80) {
 
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       "--webrtc-max-cpu-consumption-percentage",
-      base::IntToString(max_cpu_consumption_percentage));
+      base::NumberToString(max_cpu_consumption_percentage));
 
   const double actual_framerate = CaptureFrames();
 
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 6dddb58adec42a..1f1f059c14c322 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -102,7 +102,7 @@ class EncryptedMediaTest
     query_params.emplace_back("keySystem", CurrentKeySystem());
     query_params.emplace_back(
         "configChangeType",
-        base::IntToString(static_cast<int>(config_change_type)));
+        base::NumberToString(static_cast<int>(config_change_type)));
     RunMediaTestPage("mse_config_change.html", query_params, media::kEnded,
                      true);
   }
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 8c47e38dd836a4..38404f1159754f 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -135,9 +135,9 @@ class MediaTest : public testing::WithParamInterface<bool>,
 
   void RunVideoSizeTest(const char* media_file, int width, int height) {
     std::string expected;
-    expected += base::IntToString(width);
+    expected += base::NumberToString(width);
     expected += " ";
-    expected += base::IntToString(height);
+    expected += base::NumberToString(height);
     base::StringPairs query_params;
     query_params.emplace_back("video", media_file);
     RunMediaTestPage("player.html", query_params, expected, false);
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index 11bfd1e0a09b5b..e88f2a0ea7e348 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -79,7 +79,7 @@ std::string EffectsToString(int effects) {
   if (effects) {
     if (!ret.empty())
       ret += " | ";
-    ret += base::IntToString(effects);
+    ret += base::NumberToString(effects);
   }
 
   return ret;
diff --git a/content/browser/net_info_browsertest.cc b/content/browser/net_info_browsertest.cc
index 56ab286605cb0f..b94d463a46c167 100644
--- a/content/browser/net_info_browsertest.cc
+++ b/content/browser/net_info_browsertest.cc
@@ -413,7 +413,7 @@ IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, NetworkQualityRandomized) {
   for (size_t i = 0; i < 10; ++i) {
     // The noise added is a function of the hostname. Varying the hostname
     // should vary the noise.
-    std::string fake_hostname = "example" + base::IntToString(i) + ".com";
+    std::string fake_hostname = "example" + base::NumberToString(i) + ".com";
     EXPECT_TRUE(NavigateToURL(shell(), embedded_test_server()->GetURL(
                                            fake_hostname, "/net_info.html")));
     VerifyRtt(http_rtt, RunScriptExtractInt("getRtt()"));
diff --git a/content/browser/notifications/notification_id_generator.cc b/content/browser/notifications/notification_id_generator.cc
index 9ab34c96aaebe4..68298dd1c0b2f7 100644
--- a/content/browser/notifications/notification_id_generator.cc
+++ b/content/browser/notifications/notification_id_generator.cc
@@ -50,11 +50,11 @@ std::string NotificationIdGenerator::GenerateForPersistentNotification(
   stream << origin;
   stream << kNotificationTagSeparator;
 
-  stream << base::IntToString(!tag.empty());
+  stream << base::NumberToString(!tag.empty());
   if (tag.size())
     stream << tag;
   else
-    stream << base::Int64ToString(persistent_notification_id);
+    stream << base::NumberToString(persistent_notification_id);
 
   return stream.str();
 }
diff --git a/content/browser/notifications/notification_id_generator_unittest.cc b/content/browser/notifications/notification_id_generator_unittest.cc
index 5cd5460d5ff959..b8031137f23a04 100644
--- a/content/browser/notifications/notification_id_generator_unittest.cc
+++ b/content/browser/notifications/notification_id_generator_unittest.cc
@@ -80,7 +80,7 @@ TEST_F(NotificationIdGeneratorTest, GenerateForPersistent_DifferentIds) {
 TEST_F(NotificationIdGeneratorTest, GenerateForPersistent_NumericTagAmbiguity) {
   EXPECT_NE(
       generator_.GenerateForPersistentNotification(
-          origin_.GetURL(), base::Int64ToString(kPersistentNotificationId),
+          origin_.GetURL(), base::NumberToString(kPersistentNotificationId),
           kPersistentNotificationId),
       generator_.GenerateForPersistentNotification(
           origin_.GetURL(), "" /* tag */, kPersistentNotificationId));
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 6fbef65d6e53ce..2d57937dfffb4e 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -408,10 +408,10 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
   const gfx::FontRenderParams font_params =
       gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr);
   cmd_line->AppendSwitchASCII(switches::kPpapiAntialiasedTextEnabled,
-                              base::IntToString(font_params.antialiasing));
+                              base::NumberToString(font_params.antialiasing));
   cmd_line->AppendSwitchASCII(
       switches::kPpapiSubpixelRenderingSetting,
-      base::IntToString(font_params.subpixel_rendering));
+      base::NumberToString(font_params.subpixel_rendering));
 #endif
 
   if (!plugin_launcher.empty())
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 90c0a16ae7fe53..58faf4fb7a6191 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -276,9 +276,9 @@
 #endif
 
 #if defined(OS_WIN)
-#define IntToStringType base::IntToString16
+#define NumberToStringType base::NumberToString16
 #else
-#define IntToStringType base::IntToString
+#define NumberToStringType base::NumberToString
 #endif
 
 namespace content {
@@ -2913,12 +2913,12 @@ StoragePartition* RenderProcessHostImpl::GetStoragePartition() {
 static void AppendCompositorCommandLineFlags(base::CommandLine* command_line) {
   command_line->AppendSwitchASCII(
       switches::kNumRasterThreads,
-      base::IntToString(NumberOfRendererRasterThreads()));
+      base::NumberToString(NumberOfRendererRasterThreads()));
 
   int msaa_sample_count = GpuRasterizationMSAASampleCount();
   if (msaa_sample_count >= 0) {
     command_line->AppendSwitchASCII(switches::kGpuRasterizationMSAASampleCount,
-                                    base::IntToString(msaa_sample_count));
+                                    base::NumberToString(msaa_sample_count));
   }
 
   if (IsZeroCopyUploadEnabled())
@@ -4682,7 +4682,8 @@ void RenderProcessHostImpl::EnableAecDumpForId(const base::FilePath& file,
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::PostTaskAndReplyWithResult(
       &GetAecDumpFileTaskRunner(), FROM_HERE,
-      base::Bind(&CreateFileForProcess, file.AddExtension(IntToStringType(id))),
+      base::Bind(&CreateFileForProcess,
+                 file.AddExtension(NumberToStringType(id))),
       base::Bind(&RenderProcessHostImpl::SendAecDumpFileToRenderer,
                  weak_factory_.GetWeakPtr(), id));
 }
@@ -4701,7 +4702,7 @@ void RenderProcessHostImpl::SendDisableAecDumpToRenderer() {
 
 base::FilePath RenderProcessHostImpl::GetAecDumpFilePathWithExtensions(
     const base::FilePath& file) {
-  return file.AddExtension(IntToStringType(GetProcess().Pid()))
+  return file.AddExtension(NumberToStringType(GetProcess().Pid()))
       .AddExtension(kAecDumpFileNameAddition);
 }
 
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 8e43901244987b..c7f31a4704038c 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -2571,7 +2571,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
   EXPECT_EQ("OK", GetString(*dict, "statusText"));
   EXPECT_TRUE(CheckHeader(*dict, "content-type", "text/html"));
   EXPECT_TRUE(CheckHeader(*dict, "content-length",
-                          base::IntToString(sizeof(kPage) - 1)));
+                          base::NumberToString(sizeof(kPage) - 1)));
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, NotEnabled) {
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc
index 79422c740bd635..0137f9a8f41861 100644
--- a/content/browser/service_worker/service_worker_database.cc
+++ b/content/browser/service_worker/service_worker_database.cc
@@ -31,7 +31,7 @@
 // =======================
 //
 // NOTE
-// - int64_t value is serialized as a string by base::Int64ToString().
+// - int64_t value is serialized as a string by base::NumberToString().
 // - GURL value is serialized as a string by GURL::spec().
 //
 // Version 1 (in sorted order)
@@ -148,19 +148,19 @@ std::string CreateRegistrationKeyPrefix(const GURL& origin) {
 }
 
 std::string CreateRegistrationKey(int64_t registration_id, const GURL& origin) {
-  return CreateRegistrationKeyPrefix(origin)
-      .append(base::Int64ToString(registration_id));
+  return CreateRegistrationKeyPrefix(origin).append(
+      base::NumberToString(registration_id));
 }
 
 std::string CreateResourceRecordKeyPrefix(int64_t version_id) {
   return base::StringPrintf("%s%s%c", service_worker_internals::kResKeyPrefix,
-                            base::Int64ToString(version_id).c_str(),
+                            base::NumberToString(version_id).c_str(),
                             service_worker_internals::kKeySeparator);
 }
 
 std::string CreateResourceRecordKey(int64_t version_id, int64_t resource_id) {
-  return CreateResourceRecordKeyPrefix(version_id).append(
-      base::Int64ToString(resource_id));
+  return CreateResourceRecordKeyPrefix(version_id)
+      .append(base::NumberToString(resource_id));
 }
 
 std::string CreateUniqueOriginKey(const GURL& origin) {
@@ -169,14 +169,14 @@ std::string CreateUniqueOriginKey(const GURL& origin) {
 }
 
 std::string CreateResourceIdKey(const char* key_prefix, int64_t resource_id) {
-  return base::StringPrintf(
-      "%s%s", key_prefix, base::Int64ToString(resource_id).c_str());
+  return base::StringPrintf("%s%s", key_prefix,
+                            base::NumberToString(resource_id).c_str());
 }
 
 std::string CreateUserDataKeyPrefix(int64_t registration_id) {
   return base::StringPrintf("%s%s%c",
                             service_worker_internals::kRegUserDataKeyPrefix,
-                            base::Int64ToString(registration_id).c_str(),
+                            base::NumberToString(registration_id).c_str(),
                             service_worker_internals::kKeySeparator);
 }
 
@@ -194,13 +194,13 @@ std::string CreateHasUserDataKeyPrefix(const std::string& user_data_name) {
 std::string CreateHasUserDataKey(int64_t registration_id,
                                  const std::string& user_data_name) {
   return CreateHasUserDataKeyPrefix(user_data_name)
-      .append(base::Int64ToString(registration_id));
+      .append(base::NumberToString(registration_id));
 }
 
 std::string CreateRegistrationIdToOriginKey(int64_t registration_id) {
   return base::StringPrintf("%s%s",
                             service_worker_internals::kRegIdToOriginKeyPrefix,
-                            base::Int64ToString(registration_id).c_str());
+                            base::NumberToString(registration_id).c_str());
 }
 
 void PutUniqueOriginToBatch(const GURL& origin,
@@ -1817,7 +1817,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteBatch(
     // Write database default values.
     batch->Put(
         service_worker_internals::kDatabaseVersionKey,
-        base::Int64ToString(service_worker_internals::kCurrentSchemaVersion));
+        base::NumberToString(service_worker_internals::kCurrentSchemaVersion));
     state_ = DATABASE_STATE_INITIALIZED;
   }
 
@@ -1834,7 +1834,7 @@ void ServiceWorkerDatabase::BumpNextRegistrationIdIfNeeded(
   if (next_avail_registration_id_ <= used_id) {
     next_avail_registration_id_ = used_id + 1;
     batch->Put(service_worker_internals::kNextRegIdKey,
-               base::Int64ToString(next_avail_registration_id_));
+               base::NumberToString(next_avail_registration_id_));
   }
 }
 
@@ -1845,7 +1845,7 @@ void ServiceWorkerDatabase::BumpNextResourceIdIfNeeded(
   if (next_avail_resource_id_ <= used_id) {
     next_avail_resource_id_ = used_id + 1;
     batch->Put(service_worker_internals::kNextResIdKey,
-               base::Int64ToString(next_avail_resource_id_));
+               base::NumberToString(next_avail_resource_id_));
   }
 }
 
@@ -1856,7 +1856,7 @@ void ServiceWorkerDatabase::BumpNextVersionIdIfNeeded(
   if (next_avail_version_id_ <= used_id) {
     next_avail_version_id_ = used_id + 1;
     batch->Put(service_worker_internals::kNextVerIdKey,
-               base::Int64ToString(next_avail_version_id_));
+               base::NumberToString(next_avail_version_id_));
   }
 }
 
diff --git a/content/browser/service_worker/service_worker_database_unittest.cc b/content/browser/service_worker/service_worker_database_unittest.cc
index 305f0ffc85a1b6..2ba6e269072137 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -180,7 +180,7 @@ TEST(ServiceWorkerDatabaseTest, DatabaseVersion_ObsoleteSchemaVersion) {
   // Emulate an obsolete schema version.
   int64_t old_db_version = 1;
   leveldb::WriteBatch batch;
-  batch.Put("INITDATA_DB_VERSION", base::Int64ToString(old_db_version));
+  batch.Put("INITDATA_DB_VERSION", base::NumberToString(old_db_version));
   ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteBatch(&batch));
   db_version = -1;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
@@ -220,7 +220,7 @@ TEST(ServiceWorkerDatabaseTest, DatabaseVersion_CorruptedSchemaVersion) {
   // Emulate a corrupted schema version.
   int64_t corrupted_db_version = -10;
   leveldb::WriteBatch batch;
-  batch.Put("INITDATA_DB_VERSION", base::Int64ToString(corrupted_db_version));
+  batch.Put("INITDATA_DB_VERSION", base::NumberToString(corrupted_db_version));
   ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteBatch(&batch));
   db_version = -1;
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED,
diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc
index 3fd03a4e018322..4940cfce928d64 100644
--- a/content/browser/service_worker/service_worker_internals_ui.cc
+++ b/content/browser/service_worker/service_worker_internals_ui.cc
@@ -146,7 +146,7 @@ void UpdateVersionInfo(const ServiceWorkerVersionInfo& version,
   }
 
   info->SetString("script_url", version.script_url.spec());
-  info->SetString("version_id", base::Int64ToString(version.version_id));
+  info->SetString("version_id", base::NumberToString(version.version_id));
   info->SetInteger("process_id",
                    static_cast<int>(GetRealProcessId(version.process_id)));
   info->SetInteger("process_host_id", version.process_id);
@@ -162,7 +162,7 @@ std::unique_ptr<ListValue> GetRegistrationListValue(
     auto registration_info = std::make_unique<DictionaryValue>();
     registration_info->SetString("scope", registration.scope.spec());
     registration_info->SetString(
-        "registration_id", base::Int64ToString(registration.registration_id));
+        "registration_id", base::NumberToString(registration.registration_id));
     registration_info->SetBoolean("navigation_preload_enabled",
                                   registration.navigation_preload_enabled);
     registration_info->SetInteger(
@@ -254,7 +254,7 @@ class ServiceWorkerInternalsUI::PartitionObserver
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     web_ui_->CallJavascriptFunctionUnsafe(
         "serviceworker.onRunningStateChanged", Value(partition_id_),
-        Value(base::Int64ToString(version_id)));
+        Value(base::NumberToString(version_id)));
   }
   void OnVersionStateChanged(int64_t version_id,
                              const GURL& scope,
@@ -262,14 +262,14 @@ class ServiceWorkerInternalsUI::PartitionObserver
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     web_ui_->CallJavascriptFunctionUnsafe(
         "serviceworker.onVersionStateChanged", Value(partition_id_),
-        Value(base::Int64ToString(version_id)));
+        Value(base::NumberToString(version_id)));
   }
   void OnErrorReported(int64_t version_id,
                        const ErrorInfo& info) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     std::vector<std::unique_ptr<const Value>> args;
     args.push_back(std::make_unique<Value>(partition_id_));
-    args.push_back(std::make_unique<Value>(base::Int64ToString(version_id)));
+    args.push_back(std::make_unique<Value>(base::NumberToString(version_id)));
     auto value = std::make_unique<DictionaryValue>();
     value->SetString("message", info.error_message);
     value->SetInteger("lineNumber", info.line_number);
@@ -284,7 +284,7 @@ class ServiceWorkerInternalsUI::PartitionObserver
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     std::vector<std::unique_ptr<const Value>> args;
     args.push_back(std::make_unique<Value>(partition_id_));
-    args.push_back(std::make_unique<Value>(base::Int64ToString(version_id)));
+    args.push_back(std::make_unique<Value>(base::NumberToString(version_id)));
     auto value = std::make_unique<DictionaryValue>();
     value->SetInteger("sourceIdentifier", message.source_identifier);
     value->SetInteger("message_level", message.message_level);
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 001baf7d8f1489..d2464e1375d2a6 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -3799,9 +3799,9 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
 
     NavigateFrameToURL(child, urls[i]);
 
-    EXPECT_EQ(base::IntToString(current_margin_width),
+    EXPECT_EQ(base::NumberToString(current_margin_width),
               EvalJs(child, "document.body.getAttribute('marginwidth');"));
-    EXPECT_EQ(base::IntToString(current_margin_height),
+    EXPECT_EQ(base::NumberToString(current_margin_height),
               EvalJs(child, "document.body.getAttribute('marginheight');"));
 
     current_margin_width += 5;
diff --git a/content/browser/speech/audio_encoder.cc b/content/browser/speech/audio_encoder.cc
index c036c2d5a136bc..e32723b8543672 100644
--- a/content/browser/speech/audio_encoder.cc
+++ b/content/browser/speech/audio_encoder.cc
@@ -82,7 +82,7 @@ scoped_refptr<AudioChunk> AudioEncoder::GetEncodedDataAndClear() {
 
 std::string AudioEncoder::GetMimeType() {
   return std::string(kContentTypeFLAC) +
-      base::UintToString(FLAC__stream_encoder_get_sample_rate(encoder_));
+         base::NumberToString(FLAC__stream_encoder_get_sample_rate(encoder_));
 }
 
 int AudioEncoder::GetBitsPerSample() {
diff --git a/content/browser/speech/speech_recognition_engine.cc b/content/browser/speech/speech_recognition_engine.cc
index 3bb628ae218b15..aac4f3917c02b6 100644
--- a/content/browser/speech/speech_recognition_engine.cc
+++ b/content/browser/speech/speech_recognition_engine.cc
@@ -582,7 +582,7 @@ SpeechRecognitionEngine::ConnectBothStreams(const FSMEventArgs&) {
     uint32_t max_alternatives =
         std::min(kMaxMaxAlternatives, config_.max_hypotheses);
     upstream_args.push_back("maxAlternatives=" +
-                            base::UintToString(max_alternatives));
+                            base::NumberToString(max_alternatives));
   }
   upstream_args.push_back("app=chromium");
   for (const blink::mojom::SpeechRecognitionGrammar& grammar :
diff --git a/content/browser/speech/tts_win.cc b/content/browser/speech/tts_win.cc
index 78d1a588001c68..ddddb25b3c539e 100644
--- a/content/browser/speech/tts_win.cc
+++ b/content/browser/speech/tts_win.cc
@@ -109,8 +109,7 @@ bool TtsPlatformImplWin::Speak(int utterance_id,
     // The TTS api allows a range of -10 to 10 for speech pitch.
     // TODO(dtseng): cleanup if we ever use any other properties that
     // require xml.
-    std::wstring pitch_value =
-        base::IntToString16(static_cast<int>(params.pitch * 10 - 10));
+    std::wstring pitch_value = base::NumberToString16(params.pitch * 10 - 10);
     prefix = L"<pitch absmiddle=\"" + pitch_value + L"\">";
     suffix = L"</pitch>";
   }
diff --git a/content/browser/streams/stream_url_request_job.cc b/content/browser/streams/stream_url_request_job.cc
index 89fb1ebef3171d..0fc62ae14f565a 100644
--- a/content/browser/streams/stream_url_request_job.cc
+++ b/content/browser/streams/stream_url_request_job.cc
@@ -184,7 +184,7 @@ void StreamURLRequestJob::NotifyMethodNotSupported() {
   error_code_ = net::ERR_METHOD_NOT_SUPPORTED;
 
   std::string status("HTTP/1.1 ");
-  status.append(base::IntToString(status_code));
+  status.append(base::NumberToString(status_code));
   status.append(" ");
   status.append(net::GetHttpReasonPhrase(status_code));
   status.append("\0\0", 2);
diff --git a/content/browser/vibration_browsertest.cc b/content/browser/vibration_browsertest.cc
index 5713aae7bbe91f..df3bba70ad4570 100644
--- a/content/browser/vibration_browsertest.cc
+++ b/content/browser/vibration_browsertest.cc
@@ -52,7 +52,7 @@ class VibrationTest : public ContentBrowserTest,
     bool result;
     RenderFrameHost* frame = shell()->web_contents()->GetMainFrame();
     std::string script = "domAutomationController.send(navigator.vibrate(" +
-                         base::IntToString(duration) + "))";
+                         base::NumberToString(duration) + "))";
     EXPECT_TRUE(ExecuteScriptAndExtractBool(frame, script, &result));
     return result;
   }
diff --git a/content/browser/webrtc/webrtc_audio_debug_recordings_browsertest.cc b/content/browser/webrtc/webrtc_audio_debug_recordings_browsertest.cc
index 65b3adef54f10c..1634e0e34f5b0b 100644
--- a/content/browser/webrtc/webrtc_audio_debug_recordings_browsertest.cc
+++ b/content/browser/webrtc/webrtc_audio_debug_recordings_browsertest.cc
@@ -20,9 +20,9 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_WIN)
-#define IntToStringType base::IntToString16
+#define NumberToStringType base::NumberToString16
 #else
-#define IntToStringType base::IntToString
+#define NumberToStringType base::NumberToString
 #endif
 
 namespace {
@@ -39,9 +39,9 @@ const base::FilePath::CharType kBaseFilename[] =
 // "/tmp/.com.google.Chrome.Z6UC3P.12345.aec_dump.1".
 base::FilePath GetExpectedAecDumpFileName(const base::FilePath& base_file_path,
                                           int render_process_id) {
-  return base_file_path.AddExtension(IntToStringType(render_process_id))
+  return base_file_path.AddExtension(NumberToStringType(render_process_id))
       .AddExtension(FILE_PATH_LITERAL("aec_dump"))
-      .AddExtension(IntToStringType(kExpectedConsumerId));
+      .AddExtension(NumberToStringType(kExpectedConsumerId));
 }
 
 // Get the file names of the recordings. The name will be
diff --git a/content/browser/webrtc/webrtc_internals.cc b/content/browser/webrtc/webrtc_internals.cc
index 86c3b4be5bc1c3..c0d0ace6e1812d 100644
--- a/content/browser/webrtc/webrtc_internals.cc
+++ b/content/browser/webrtc/webrtc_internals.cc
@@ -34,12 +34,6 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/shell_dialogs/select_file_policy.h"
 
-#if defined(OS_WIN)
-#define IntToStringType base::IntToString16
-#else
-#define IntToStringType base::IntToString
-#endif
-
 using base::ProcessId;
 using std::string;
 
diff --git a/content/common/ax_content_node_data.cc b/content/common/ax_content_node_data.cc
index 7dec9c68199270..01166e0535b1ee 100644
--- a/content/common/ax_content_node_data.cc
+++ b/content/common/ax_content_node_data.cc
@@ -8,7 +8,7 @@
 
 #include "base/strings/string_number_conversions.h"
 
-using base::IntToString;
+using base::NumberToString;
 
 namespace content {
 
@@ -76,7 +76,7 @@ std::string AXContentNodeData::ToString() const {
   std::string result = AXNodeData::ToString();
 
   for (auto iter : content_int_attributes) {
-    std::string value = IntToString(iter.second);
+    std::string value = NumberToString(iter.second);
     switch (iter.first) {
       case AX_CONTENT_ATTR_CHILD_ROUTING_ID:
         result += " child_routing_id=" + value;
@@ -106,9 +106,9 @@ std::string AXContentTreeData::ToString() const {
   std::string result = AXTreeData::ToString();
 
   if (routing_id != -1)
-    result += " routing_id=" + IntToString(routing_id);
+    result += " routing_id=" + NumberToString(routing_id);
   if (parent_routing_id != -1)
-    result += " parent_routing_id=" + IntToString(parent_routing_id);
+    result += " parent_routing_id=" + NumberToString(parent_routing_id);
 
   return result;
 }
diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
index 5f47540ba3c15b..df9ba8ba827285 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -95,7 +95,7 @@ void WaitForDebugger(const std::string& label) {
   title += label;  // makes attaching to process easier
   std::string message = label;
   message += " starting with pid: ";
-  message += base::IntToString(base::GetCurrentProcId());
+  message += base::NumberToString(base::GetCurrentProcId());
   ::MessageBox(NULL, base::UTF8ToWide(message).c_str(),
                base::UTF8ToWide(title).c_str(), MB_OK | MB_SETFOREGROUND);
 #elif defined(OS_POSIX)
diff --git a/content/common/unique_name_helper.cc b/content/common/unique_name_helper.cc
index 26d8a5e22d64d5..f372bd0a4b76fd 100644
--- a/content/common/unique_name_helper.cc
+++ b/content/common/unique_name_helper.cc
@@ -89,7 +89,7 @@ std::string GenerateCandidate(const FrameAdapter* frame) {
   new_name += base::JoinString(ancestor_names, "/");
 
   new_name += "/<!--frame";
-  new_name += base::IntToString(frame->GetSiblingCount());
+  new_name += base::NumberToString(frame->GetSiblingCount());
   new_name += "-->-->";
 
   // NOTE: This name might not be unique - see http://crbug.com/588800.
@@ -102,7 +102,7 @@ std::string GenerateFramePosition(const FrameAdapter* frame) {
       frame->GetFramePosition(FrameAdapter::BeginPoint::kParentFrame);
   for (int position : positions) {
     position_string += '-';
-    position_string += base::IntToString(position);
+    position_string += base::NumberToString(position);
   }
 
   // NOTE: The generated string is not guaranteed to be unique, but should
@@ -134,7 +134,7 @@ std::string AppendUniqueSuffix(const FrameAdapter* frame,
   candidate += '/';
   while (true) {
     size_t current_length = candidate.size();
-    candidate += base::IntToString(number_of_retries++);
+    candidate += base::NumberToString(number_of_retries++);
     candidate += "-->";
     if (frame->IsCandidateUnique(candidate))
       break;
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 34f784fcbc1870..e866b15c4eede8 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -195,11 +195,11 @@ std::string DesktopMediaID::ToString() const {
 
   // Screen and Window types.
   prefix.append(":");
-  prefix.append(base::Int64ToString(id));
+  prefix.append(base::NumberToString(id));
 
 #if defined(USE_AURA)
   prefix.append(":");
-  prefix.append(base::Int64ToString(aura_id));
+  prefix.append(base::NumberToString(aura_id));
 #endif  // defined(USE_AURA)
 
   return prefix;
diff --git a/content/public/browser/web_contents_media_capture_id.cc b/content/public/browser/web_contents_media_capture_id.cc
index 2835818bc44e0c..bfaeb2a2f96616 100644
--- a/content/public/browser/web_contents_media_capture_id.cc
+++ b/content/public/browser/web_contents_media_capture_id.cc
@@ -104,9 +104,9 @@ bool WebContentsMediaCaptureId::is_null() const {
 
 std::string WebContentsMediaCaptureId::ToString() const {
   std::string s = kWebContentsCaptureScheme;
-  s.append(base::Int64ToString(render_process_id));
+  s.append(base::NumberToString(render_process_id));
   s.append(":");
-  s.append(base::Int64ToString(main_render_frame_id));
+  s.append(base::NumberToString(main_render_frame_id));
 
   char connector = kOptionStart;
   if (enable_auto_throttling) {
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 7cde5af0400add..5bb0e93f79e6b2 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -193,7 +193,7 @@ void BrowserTestBase::SetUp() {
   // when sharded.
   command_line->AppendSwitchASCII(
       switches::kIPCConnectionTimeout,
-      base::Int64ToString(TestTimeouts::action_max_timeout().InSeconds()));
+      base::NumberToString(TestTimeouts::action_max_timeout().InSeconds()));
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   if (AllowFileAccessFromFiles())
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index fc5ad8fa8ba7d1..deb05aa4709302 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -455,7 +455,7 @@ void BrowserPlugin::UpdateInternalInstanceId() {
   // by firing an event from there.
   UpdateDOMAttribute(
       "internalinstanceid",
-      base::UTF8ToUTF16(base::IntToString(browser_plugin_instance_id_)));
+      base::UTF8ToUTF16(base::NumberToString(browser_plugin_instance_id_)));
 }
 
 void BrowserPlugin::UpdateGuestFocusState(blink::WebFocusType focus_type) {
diff --git a/content/renderer/gpu_benchmarking_extension.cc b/content/renderer/gpu_benchmarking_extension.cc
index 16042ecacac159..5d2a7603b2cd28 100644
--- a/content/renderer/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu_benchmarking_extension.cc
@@ -107,7 +107,8 @@ class SkPictureSerializer {
       // with
       // --no-sandbox command-line flag. Get rid of this limitation.
       // CRBUG: 139640.
-      std::string filename = "layer_" + base::IntToString(layer_id_++) + ".skp";
+      std::string filename =
+          "layer_" + base::NumberToString(layer_id_++) + ".skp";
       std::string filepath = dirpath_.AppendASCII(filename).MaybeAsASCII();
       DCHECK(!filepath.empty());
       SkFILEWStream file(filepath.c_str());
diff --git a/content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.cc b/content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.cc
index face97bdd03ec0..af68f05a44136c 100644
--- a/content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.cc
+++ b/content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.cc
@@ -32,18 +32,20 @@ void MockMojoMediaStreamDispatcherHost::GenerateStream(
 
   if (controls.audio.requested) {
     blink::MediaStreamDevice audio_device;
-    audio_device.id = controls.audio.device_id + base::IntToString(session_id_);
+    audio_device.id =
+        controls.audio.device_id + base::NumberToString(session_id_);
     audio_device.name = "microphone";
     audio_device.type = controls.audio.stream_type;
     audio_device.session_id = session_id_;
     audio_device.matched_output_device_id =
-        "associated_output_device_id" + base::IntToString(request_id_);
+        "associated_output_device_id" + base::NumberToString(request_id_);
     audio_devices_.push_back(audio_device);
   }
 
   if (controls.video.requested) {
     blink::MediaStreamDevice video_device;
-    video_device.id = controls.video.device_id + base::IntToString(session_id_);
+    video_device.id =
+        controls.video.device_id + base::NumberToString(session_id_);
     video_device.name = "usb video camera";
     video_device.type = controls.video.stream_type;
     video_device.video_facing = media::MEDIA_VIDEO_FACING_USER;
@@ -55,7 +57,7 @@ void MockMojoMediaStreamDispatcherHost::GenerateStream(
     generate_stream_cb_ = std::move(callback);
   } else {
     std::move(callback).Run(blink::MEDIA_DEVICE_OK,
-                            "dummy" + base::IntToString(request_id_),
+                            "dummy" + base::NumberToString(request_id_),
                             audio_devices_, video_devices_);
   }
 }
@@ -92,7 +94,7 @@ void MockMojoMediaStreamDispatcherHost::OpenDevice(
   device.type = type;
   device.session_id = session_id_;
   std::move(callback).Run(true /* success */,
-                          "dummy" + base::IntToString(request_id), device);
+                          "dummy" + base::NumberToString(request_id), device);
 }
 
 }  // namespace content
diff --git a/content/renderer/media/webrtc/peer_connection_tracker.cc b/content/renderer/media/webrtc/peer_connection_tracker.cc
index b8a467cd84391b..c4a23f2edb0a00 100644
--- a/content/renderer/media/webrtc/peer_connection_tracker.cc
+++ b/content/renderer/media/webrtc/peer_connection_tracker.cc
@@ -686,7 +686,7 @@ void PeerConnectionTracker::TrackAddIceCandidate(
     return;
   std::string value =
       "sdpMid: " + candidate->SdpMid().Utf8() + ", " +
-      "sdpMLineIndex: " + base::UintToString(candidate->SdpMLineIndex()) +
+      "sdpMLineIndex: " + base::NumberToString(candidate->SdpMLineIndex()) +
       ", " + "candidate: " + candidate->Candidate().Utf8();
 
   // OnIceCandidate always succeeds as it's a callback from the browser.
@@ -764,7 +764,7 @@ void PeerConnectionTracker::TrackTransceiver(
         blink::WebRTCRtpTransceiverImplementationType::kPlanBReceiverOnly);
     result += "getReceivers()";
   }
-  result += "[" + base::UintToString(transceiver_index) + "]:";
+  result += "[" + base::NumberToString(transceiver_index) + "]:";
   result += SerializeTransceiver(transceiver);
   SendPeerConnectionUpdate(id, callback_type, result);
 }
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index cbcb0edd502ec5..19afe96f42e239 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -3267,8 +3267,9 @@ void PepperPluginInstanceImpl::SetSizeAttributesForFullscreen() {
 
   blink::WebScreenInfo info = render_frame_->render_view()->GetScreenInfo();
   screen_size_for_fullscreen_ = gfx::Size(info.rect.width, info.rect.height);
-  std::string width = base::IntToString(screen_size_for_fullscreen_.width());
-  std::string height = base::IntToString(screen_size_for_fullscreen_.height());
+  std::string width = base::NumberToString(screen_size_for_fullscreen_.width());
+  std::string height =
+      base::NumberToString(screen_size_for_fullscreen_.height());
 
   WebElement element = container_->GetElement();
   element.SetAttribute(WebString::FromUTF8(kWidth), WebString::FromUTF8(width));
diff --git a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
index 053415263f2aaa..40e5a6ab424c24 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
+++ b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
@@ -1255,7 +1255,7 @@ TEST_F(ServiceWorkerSubresourceLoaderTest, TooManyRedirects) {
   int count = 1;
   std::string redirect_location =
       std::string("https://www.example.com/redirect_") +
-      base::IntToString(count);
+      base::NumberToString(count);
   fake_controller_.RespondWithRedirect(redirect_location);
   network::mojom::URLLoaderFactoryPtr factory =
       CreateSubresourceLoaderFactory();
@@ -1286,7 +1286,7 @@ TEST_F(ServiceWorkerSubresourceLoaderTest, TooManyRedirects) {
 
     // Redirect more.
     redirect_location = std::string("https://www.example.com/redirect_") +
-                        base::IntToString(count);
+                        base::NumberToString(count);
     fake_controller_.RespondWithRedirect(redirect_location);
     loader->FollowRedirect({}, {}, base::nullopt);
   }
diff --git a/content/shell/browser/web_test/blink_test_controller.cc b/content/shell/browser/web_test/blink_test_controller.cc
index 6d6d12c8036b90..718be489c60eb4 100644
--- a/content/shell/browser/web_test/blink_test_controller.cc
+++ b/content/shell/browser/web_test/blink_test_controller.cc
@@ -893,7 +893,7 @@ void BlinkTestController::RenderProcessExited(
       const base::Process& process = render_process_host->GetProcess();
       if (process.IsValid()) {
         printer_->AddErrorMessage(std::string("#CRASHED - renderer (pid ") +
-                                  base::IntToString(process.Pid()) + ")");
+                                  base::NumberToString(process.Pid()) + ")");
       } else {
         printer_->AddErrorMessage("#CRASHED - renderer");
       }
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index c3aa914f8a2360..a4aab9c4237fa2 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -143,7 +143,7 @@ void ShellContentRendererClient::PrepareErrorPage(
     *error_html =
         "<head><title>Error</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>Could not load the requested "
         "resource.<br/>Error code: " +
-        base::IntToString(error.reason()) +
+        base::NumberToString(error.reason()) +
         (error.reason() < 0 ? " (" + net::ErrorToString(error.reason()) + ")"
                             : "") +
         "</body>";
@@ -160,7 +160,7 @@ void ShellContentRendererClient::PrepareErrorPageForHttpStatusError(
   if (error_html) {
     *error_html =
         "<head><title>Error</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>Server returned HTTP status " +
-        base::IntToString(http_status) + "</body>";
+        base::NumberToString(http_status) + "</body>";
   }
 }