Use correct IntToString variants in //chrome

Using IntToString() with a type larger than an int can lead to
unexpected truncation. Similarly, using it with an unsigned value can
lead to undesirable results.

Use the appropriate IntToString() variant for the type of the integer
being converted.

BUG=505479
TEST=compiled

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

Cr-Commit-Position: refs/heads/master@{#349846}

40 files changed, 87 insertions, 97 deletions

diff --git a/chrome/browser/apps/ephemeral_app_service_unittest.cc b/chrome/browser/apps/ephemeral_app_service_unittest.cc
index aad6627..34b7f56 100644
--- a/chrome/browser/apps/ephemeral_app_service_unittest.cc
+++ b/chrome/browser/apps/ephemeral_app_service_unittest.cc
@@ -94,7 +94,7 @@ class EphemeralAppServiceTest : public testing::Test {
                            LaunchTimeAppMap* launch_times,
                            std::set<std::string>* generated_ids = NULL) {
     for (int i = 0; i < count; ++i) {
-      std::string app_id = base::IntToString(launch_times->size());
+      std::string app_id = base::SizeTToString(launch_times->size());
       launch_times->insert(std::make_pair(
           GetPastTime(reference_time, days_before, true),
           app_id));
diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
index 77d2dfb..5ede514 100644
--- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc
+++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc
@@ -128,8 +128,8 @@ std::string TestBookmarkPositionsAsString(
        i != positions.end(); ++i) {
     if (i != positions.begin())
       position_string += ", ";
-    position_string += "{" + base::IntToString(i->begin) + ", " +
-        base::IntToString(i->end) + "}";
+    position_string += "{" + base::SizeTToString(i->begin) + ", " +
+        base::SizeTToString(i->end) + "}";
   }
   position_string += "}\n";
   return position_string;
@@ -372,7 +372,7 @@ TEST_F(BookmarkProviderTest, Rankings) {
         continue;
       EXPECT_EQ(query_data[i].matches[j],
                 base::UTF16ToUTF8(matches[j].description))
-          << "    Mismatch at [" << base::IntToString(j) << "] for query '"
+          << "    Mismatch at [" << base::SizeTToString(j) << "] for query '"
           << query_data[i].query << "'.";
     }
   }
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index c58cd33..22dd22e 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -527,14 +527,14 @@ void SearchProviderTest::CheckMatches(const std::string& description,
   SCOPED_TRACE(description);
   // Ensure that the returned matches equal the expectations.
   for (; i < matches.size(); ++i) {
-    SCOPED_TRACE(" Case # " + base::IntToString(i));
+    SCOPED_TRACE(" Case # " + base::SizeTToString(i));
     EXPECT_EQ(ASCIIToUTF16(expected_matches[i].contents), matches[i].contents);
     EXPECT_EQ(expected_matches[i].allowed_to_be_default_match,
               matches[i].allowed_to_be_default_match);
   }
   // Ensure that no expected matches are missing.
   for (; i < num_expected_matches; ++i) {
-    SCOPED_TRACE(" Case # " + base::IntToString(i));
+    SCOPED_TRACE(" Case # " + base::SizeTToString(i));
     EXPECT_EQ(kNotApplicable, expected_matches[i].contents);
   }
 }
@@ -2066,7 +2066,7 @@ TEST_F(SearchProviderTest, KeywordFetcherSuggestRelevance) {
     }
     // Ensure that no expected matches are missing.
     for (; j < arraysize(cases[i].matches); ++j) {
-      SCOPED_TRACE(" Case # " + base::IntToString(i));
+      SCOPED_TRACE(" Case # " + base::SizeTToString(i));
       EXPECT_EQ(kNotApplicable, cases[i].matches[j].contents);
     }
   }
@@ -2848,7 +2848,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) {
     // Ensure that the returned matches equal the expectations.
     for (; j < matches.size(); ++j) {
       const Match& match = cases[i].matches[j];
-      SCOPED_TRACE(" and match index: " + base::IntToString(j));
+      SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
       EXPECT_EQ(match.contents,
                 base::UTF16ToUTF8(matches[j].contents));
       EXPECT_EQ(match.description,
@@ -2861,7 +2861,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) {
     }
     // Ensure that no expected matches are missing.
     for (; j < arraysize(cases[i].matches); ++j) {
-      SCOPED_TRACE(" and match index: " + base::IntToString(j));
+      SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
       EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable);
       EXPECT_EQ(cases[i].matches[j].description, kNotApplicable);
       EXPECT_EQ(cases[i].matches[j].query_params, kNotApplicable);
@@ -3068,18 +3068,18 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_ValidResponses) {
     ASSERT_FALSE(matches.empty());
     EXPECT_GE(matches[0].relevance, 1300);
 
-    SCOPED_TRACE("for case: " + base::IntToString(i));
+    SCOPED_TRACE("for case: " + base::SizeTToString(i));
     ASSERT_LE(matches.size(), arraysize(cases[i].matches));
     size_t j = 0;
     // Ensure that the returned matches equal the expectations.
     for (; j < matches.size(); ++j) {
-      SCOPED_TRACE("and match: " + base::IntToString(j));
+      SCOPED_TRACE("and match: " + base::SizeTToString(j));
       EXPECT_EQ(cases[i].matches[j].contents,
                 base::UTF16ToUTF8(matches[j].contents));
       EXPECT_EQ(cases[i].matches[j].type, matches[j].type);
     }
     for (; j < arraysize(cases[i].matches); ++j) {
-      SCOPED_TRACE("and match: " + base::IntToString(j));
+      SCOPED_TRACE("and match: " + base::SizeTToString(j));
       EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable);
       EXPECT_EQ(cases[i].matches[j].type, AutocompleteMatchType::NUM_TYPES);
     }
@@ -3176,7 +3176,7 @@ TEST_F(SearchProviderTest, ParseDeletionUrl) {
 
        for (size_t j = 0; j < matches.size(); ++j) {
          const Match& match = cases[i].matches[j];
-         SCOPED_TRACE(" and match index: " + base::IntToString(j));
+         SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
          EXPECT_EQ(match.contents, base::UTF16ToUTF8(matches[j].contents));
          EXPECT_EQ(match.deletion_url, matches[j].GetAdditionalInfo(
              "deletion_url"));
diff --git a/chrome/browser/devtools/device/tcp_device_provider.cc b/chrome/browser/devtools/device/tcp_device_provider.cc
index b48cb68..381f4c1 100644
--- a/chrome/browser/devtools/device/tcp_device_provider.cc
+++ b/chrome/browser/devtools/device/tcp_device_provider.cc
@@ -97,7 +97,7 @@ void TCPDeviceProvider::QueryDeviceInfo(const std::string& serial,
     if (serial != target.host())
       continue;
     AndroidDeviceManager::BrowserInfo browser_info;
-    browser_info.socket_name = base::IntToString(target.port());
+    browser_info.socket_name = base::UintToString(target.port());
     browser_info.display_name = kBrowserName;
     browser_info.type = AndroidDeviceManager::BrowserInfo::kTypeChrome;
 
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 49c8f58..e7306d1 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -60,7 +60,7 @@ class TCPServerSocketFactory
     if (last_tethering_port_ == kMaxTetheringPort)
       last_tethering_port_ = kMinTetheringPort;
     uint16 port = ++last_tethering_port_;
-    *name = base::IntToString(port);
+    *name = base::UintToString(port);
     scoped_ptr<net::TCPServerSocket> socket(
         new net::TCPServerSocket(nullptr, net::NetLog::Source()));
     if (socket->ListenWithAddressAndPort("127.0.0.1", port, kBackLog) !=
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index f63998e..830a440 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -48,7 +48,7 @@ static const char kGotTree[] = "got_tree";
 class AutomationApiTest : public ExtensionApiTest {
  protected:
   GURL GetURLForPath(const std::string& host, const std::string& path) {
-    std::string port = base::IntToString(embedded_test_server()->port());
+    std::string port = base::UintToString(embedded_test_server()->port());
     GURL::Replacements replacements;
     replacements.SetHostStr(host);
     replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
index 070a2ea..21c965c 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -132,7 +132,7 @@ class DesktopCaptureApiTest : public ExtensionApiTest {
 
  protected:
   GURL GetURLForPath(const std::string& host, const std::string& path) {
-    std::string port = base::IntToString(embedded_test_server()->port());
+    std::string port = base::UintToString(embedded_test_server()->port());
     GURL::Replacements replacements;
     replacements.SetHostStr(host);
     replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
index 60d1eb6..2ffd99d 100644
--- a/chrome/browser/extensions/chrome_url_request_util.cc
+++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -69,7 +69,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
     // Add the Content-Length header now that we know the resource length.
     response_info_.headers->AddHeader(
         base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
-                           base::UintToString((*data)->size()).c_str()));
+                           base::SizeTToString((*data)->size()).c_str()));
 
     std::string* read_mime_type = new std::string;
     bool posted = base::PostTaskAndReplyWithResult(
diff --git a/chrome/browser/extensions/content_capabilities_browsertest.cc b/chrome/browser/extensions/content_capabilities_browsertest.cc
index cb7a512..23afca7 100644
--- a/chrome/browser/extensions/content_capabilities_browsertest.cc
+++ b/chrome/browser/extensions/content_capabilities_browsertest.cc
@@ -85,7 +85,7 @@ class ContentCapabilitiesTest : public ExtensionApiTest {
   }
 
   GURL GetTestURLFor(const std::string& host) {
-    std::string port = base::IntToString(embedded_test_server()->port());
+    std::string port = base::UintToString(embedded_test_server()->port());
     GURL::Replacements replacements;
     replacements.SetHostStr(host);
     replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 42c772d..df74c5c 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -138,7 +138,7 @@ TEST_F(ErrorConsoleUnitTest, ReportErrors) {
 
   for (size_t i = 0; i < kNumTotalErrors; ++i) {
     error_console_->ReportError(
-        CreateNewManifestError(kId, base::UintToString(i)));
+        CreateNewManifestError(kId, base::SizeTToString(i)));
   }
 
   ASSERT_EQ(kNumTotalErrors, error_console_->GetErrorsForExtension(kId).size());
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 12e0c53..0ebda6e 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -546,8 +546,8 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
   size_t num_after = registry->enabled_extensions().size();
   EXPECT_EQ(num_before + expected_change, num_after);
   if (num_before + expected_change != num_after) {
-    VLOG(1) << "Num extensions before: " << base::IntToString(num_before)
-            << " num after: " << base::IntToString(num_after)
+    VLOG(1) << "Num extensions before: " << base::SizeTToString(num_before)
+            << " num after: " << base::SizeTToString(num_after)
             << " Installed extensions follow:";
 
     for (const scoped_refptr<const Extension>& extension :
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index f62159b..e203425 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -278,7 +278,7 @@ class ExternallyConnectableMessagingTest : public ExtensionApiTest {
   }
 
   GURL GetURLForPath(const std::string& host, const std::string& path) {
-    std::string port = base::IntToString(embedded_test_server()->port());
+    std::string port = base::UintToString(embedded_test_server()->port());
     GURL::Replacements replacements;
     replacements.SetHostStr(host);
     replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index 02ea2e5..7da8fef 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -442,9 +442,10 @@ void ExtensionStorageMonitor::OnImageLoaded(
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
       l10n_util::GetStringUTF16(IDS_EXTENSION_STORAGE_MONITOR_TITLE),
-      l10n_util::GetStringFUTF16(IDS_EXTENSION_STORAGE_MONITOR_TEXT,
-                                 base::UTF8ToUTF16(extension->name()),
-                                 base::IntToString16(current_usage / kMBytes)),
+      l10n_util::GetStringFUTF16(
+          IDS_EXTENSION_STORAGE_MONITOR_TEXT,
+          base::UTF8ToUTF16(extension->name()),
+          base::Int64ToString16(current_usage / kMBytes)),
       notification_image, base::string16() /* display source */, GURL(),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  kSystemNotifierId),
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 40fd5be..2eb88eb 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -61,7 +61,7 @@ base::string16 GenerateUniqueFolderName(BookmarkModel* model,
   // Otherwise iterate until we find a unique name.
   for (size_t i = 1; i <= existing_folder_names.size(); ++i) {
     base::string16 name = folder_name + base::ASCIIToUTF16(" (") +
-        base::IntToString16(i) + base::ASCIIToUTF16(")");
+        base::SizeTToString16(i) + base::ASCIIToUTF16(")");
     if (existing_folder_names.find(name) == existing_folder_names.end())
       return name;
   }
diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc
index ef6c826..84d543c 100644
--- a/chrome/browser/internal_auth.cc
+++ b/chrome/browser/internal_auth.cc
@@ -157,7 +157,7 @@ void CreatePassport(const std::string& domain,
   blob = domain + kItemSeparator;
   std::string tmp;
   ConvertVarValueMapToBlob(map, &tmp);
-  blob += tmp + kItemSeparator + base::Uint64ToString(tick);
+  blob += tmp + kItemSeparator + base::Int64ToString(tick);
 
   std::string hmac;
   unsigned char* hmac_data = reinterpret_cast<unsigned char*>(
@@ -175,7 +175,7 @@ void CreatePassport(const std::string& domain,
   DCHECK(hmac_base64.size() < result.size());
   std::copy(hmac_base64.begin(), hmac_base64.end(), result.begin());
 
-  std::string tick_decimal = base::Uint64ToString(tick);
+  std::string tick_decimal = base::Int64ToString(tick);
   DCHECK(tick_decimal.size() <= kTickStringLength);
   std::copy(
       tick_decimal.begin(),
diff --git a/chrome/browser/local_discovery/privet_http_impl.cc b/chrome/browser/local_discovery/privet_http_impl.cc
index 9f41d22..dc3b4ef 100644
--- a/chrome/browser/local_discovery/privet_http_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_impl.cc
@@ -712,7 +712,8 @@ scoped_ptr<PrivetURLFetcher> PrivetHTTPClientImpl::CreateURLFetcher(
     PrivetURLFetcher::Delegate* delegate) {
   GURL::Replacements replacements;
   replacements.SetHostStr(host_port_.host());
-  std::string port(base::IntToString(host_port_.port()));  // Keep string alive.
+  std::string port(
+      base::UintToString(host_port_.port()));  // Keep string alive.
   replacements.SetPortStr(port);
   return scoped_ptr<PrivetURLFetcher>(
       new PrivetURLFetcher(url.ReplaceComponents(replacements),
diff --git a/chrome/browser/media/webrtc_logging_handler_host.cc b/chrome/browser/media/webrtc_logging_handler_host.cc
index 1a354c3..8def219 100644
--- a/chrome/browser/media/webrtc_logging_handler_host.cc
+++ b/chrome/browser/media/webrtc_logging_handler_host.cc
@@ -615,8 +615,8 @@ void WebRtcLoggingHandlerHost::LogInitialInfoOnIOThread(
   LogToCircularBuffer(
       "Gpu: machine-model-name=" + gpu_info.machine_model_name +
       ", machine-model-version=" + gpu_info.machine_model_version +
-      ", vendor-id=" + IntToString(gpu_info.gpu.vendor_id) +
-      ", device-id=" + IntToString(gpu_info.gpu.device_id) +
+      ", vendor-id=" + base::UintToString(gpu_info.gpu.vendor_id) +
+      ", device-id=" + base::UintToString(gpu_info.gpu.device_id) +
       ", driver-vendor=" + gpu_info.driver_vendor +
       ", driver-version=" + gpu_info.driver_version);
   LogToCircularBuffer(
@@ -625,7 +625,7 @@ void WebRtcLoggingHandlerHost::LogInitialInfoOnIOThread(
       ", gl-version=" + gpu_info.gl_version);
 
   // Network interfaces
-  LogToCircularBuffer("Discovered " + IntToString(network_list.size()) +
+  LogToCircularBuffer("Discovered " + base::SizeTToString(network_list.size()) +
                       " network interfaces:");
   for (net::NetworkInterfaceList::const_iterator it = network_list.begin();
        it != network_list.end(); ++it) {
diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc
index 6327412..16beb8a 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor.cc
@@ -1245,7 +1245,7 @@ void ResourcePrefetchPredictor::ReportPredictedAccuracyStatsHelper(
   std::string prefix = key_type == PREFETCH_KEY_TYPE_HOST ?
       "ResourcePrefetchPredictor.Host.Predicted" :
       "ResourcePrefetchPredictor.Url.Predicted";
-  std::string suffix = "_" + base::IntToString(max_assumed_prefetched);
+  std::string suffix = "_" + base::SizeTToString(max_assumed_prefetched);
 
   // Macros to avoid using the STATIC_HISTOGRAM_POINTER_BLOCK in UMA_HISTOGRAM
   // definitions.
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter.cc b/chrome/browser/profile_resetter/automatic_profile_resetter.cc
index e6c886d..9386b27 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter.cc
@@ -661,14 +661,14 @@ scoped_ptr<AutomaticProfileResetter::EvaluationResults>
   for (size_t i = 0; i < kCombinedStatusMaskNumberOfBits; ++i) {
     bool flag = false;
     std::string mask_i_th_bit_key =
-        kCombinedStatusMaskKeyPrefix + base::IntToString(i + 1);
+        kCombinedStatusMaskKeyPrefix + base::SizeTToString(i + 1);
     if (interpreter.GetOutputBoolean(mask_i_th_bit_key, &flag) && flag)
       results->combined_status_mask |= (1 << i);
   }
   for (size_t i = 0; i < kSatisfiedCriteriaMaskNumberOfBits; ++i) {
     bool flag = false;
     std::string mask_i_th_bit_key =
-        kSatisfiedCriteriaMaskKeyPrefix + base::IntToString(i + 1);
+        kSatisfiedCriteriaMaskKeyPrefix + base::SizeTToString(i + 1);
     if (interpreter.GetOutputBoolean(mask_i_th_bit_key, &flag) && flag)
       results->satisfied_criteria_mask |= (1 << i);
   }
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 2f09ebd..2f2ca80 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -202,7 +202,7 @@ void OnUserManagerSystemProfileCreated(
     size_t index = cache.GetIndexOfProfileWithPath(profile_path_to_focus);
     if (index != std::string::npos) {
       page += "#";
-      page += base::IntToString(index);
+      page += base::SizeTToString(index);
     }
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_TASK_MANAGER) {
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
index ae56f72..4bd547e 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
@@ -31,7 +31,7 @@ void RecordSignatureVerificationTime(size_t file_index,
 
   base::HistogramBase* signature_verification_time_histogram =
       base::Histogram::FactoryTimeGet(
-          std::string(kHistogramName) + base::IntToString(file_index),
+          std::string(kHistogramName) + base::SizeTToString(file_index),
           base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromSeconds(20),
           50,
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 6ca11d5..5994d97 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -692,7 +692,7 @@ base::FilePath GetWebShortcutFilename(const GURL& url) {
   for (size_t i = 1; i < 100; ++i) {
     if (base::PathExists(base::FilePath(alternative_filepath))) {
       alternative_filepath = base::FilePath(
-          filepath.value() + "_" + base::IntToString(i) + ".desktop");
+          filepath.value() + "_" + base::SizeTToString(i) + ".desktop");
     } else {
       return base::FilePath(alternative_filepath).BaseName();
     }
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc
index c89d357..0e1c7e0 100644
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc
@@ -353,7 +353,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest, StatesWithLockedIcon) {
   states.push_back(ScreenlockState::PHONE_LOCKED);
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::IntToString(i));
+    SCOPED_TRACE(base::SizeTToString(i));
     state_handler_->ChangeState(states[i]);
     EXPECT_TRUE(state_handler_->IsActive());
 
@@ -469,7 +469,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest,
   states.push_back(ScreenlockState::AUTHENTICATED);
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::IntToString(i));
+    SCOPED_TRACE(base::SizeTToString(i));
     state_handler_->ChangeState(states[i]);
     ASSERT_TRUE(lock_handler_->HasCustomIcon());
     EXPECT_FALSE(lock_handler_->CustomIconHardlocksOnClick());
@@ -480,7 +480,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest,
   proximity_auth::ScreenlockBridge::Get()->SetLockHandler(lock_handler_.get());
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::IntToString(i));
+    SCOPED_TRACE(base::SizeTToString(i));
     state_handler_->ChangeState(states[i]);
     ASSERT_TRUE(lock_handler_->HasCustomIcon());
     EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());
diff --git a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
index 0ef29a9..d5f46e6 100644
--- a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
+++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
@@ -45,5 +45,5 @@ void SyncTimingHelper::PrintResult(const std::string& measurement,
                                    const std::string& trace,
                                    const base::TimeDelta& dt) {
   printf("*RESULT %s: %s= %s ms\n", measurement.c_str(), trace.c_str(),
-         base::IntToString(dt.InMillisecondsF()).c_str());
+         base::Int64ToString(dt.InMilliseconds()).c_str());
 }
diff --git a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
index 383668d..a8afb55 100644
--- a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
@@ -45,7 +45,7 @@ class LevelDBWrapperTest : public testing::Test {
     const char* keys[] = {"ab", "a", "d", "bb", "d"};
     for (size_t i = 0; i < arraysize(keys); ++i) {
       leveldb::Status status =
-          db->Put(leveldb::WriteOptions(), keys[i], base::Int64ToString(i));
+          db->Put(leveldb::WriteOptions(), keys[i], base::SizeTToString(i));
       ASSERT_TRUE(status.ok());
     }
   }
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index f89ad83..f7feec4 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -480,14 +480,14 @@ base::string16 TaskManagerModel::GetResourceGDIHandles(int index) const {
   size_t current, peak;
   GetGDIHandles(index, &current, &peak);
   return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT,
-      base::IntToString16(current), base::IntToString16(peak));
+      base::SizeTToString16(current), base::SizeTToString16(peak));
 }
 
 base::string16 TaskManagerModel::GetResourceUSERHandles(int index) const {
   size_t current, peak;
   GetUSERHandles(index, &current, &peak);
   return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT,
-      base::IntToString16(current), base::IntToString16(peak));
+      base::SizeTToString16(current), base::SizeTToString16(peak));
 }
 
 base::string16 TaskManagerModel::GetResourceWebCoreImageCacheSize(
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 13201da..36e6201 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -1517,7 +1517,7 @@ TEST_F(AutofillDialogControllerTest, IconReservedForCreditCardField) {
   };
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (size_t i = 0; i < arraysize(kSupportedCardIdrs); ++i) {
-    SCOPED_TRACE(base::IntToString(i));
+    SCOPED_TRACE(base::SizeTToString(i));
     gfx::Image supported_card_icon = rb.GetImageNamed(kSupportedCardIdrs[i]);
     EXPECT_GE(placeholder_icon.Width(), supported_card_icon.Width());
     EXPECT_GE(placeholder_icon.Height(), supported_card_icon.Height());
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
index 544fb61..b7016dc 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
@@ -331,7 +331,7 @@ void SelectFileDialogImplKDE::GetKDialogCommandLine(
     command_line->AppendSwitchNative(
         desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE3 ?
             "--embed" : "--attach",
-        base::IntToString(parent));
+        base::Uint64ToString(parent));
   }
 
   // Set the correct title for the dialog.
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
index b865b09..99c4c73 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -25,7 +25,7 @@ MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId id) {
   gallery.pref_id = id;
   gallery.device_id = storage_monitor::StorageInfo::MakeDeviceId(
       storage_monitor::StorageInfo::FIXED_MASS_STORAGE,
-      base::Int64ToString(id));
+      base::Uint64ToString(id));
   gallery.display_name = base::ASCIIToUTF16("Display Name");
   return gallery;
 }
diff --git a/chrome/browser/ui/views/new_task_manager_view.cc b/chrome/browser/ui/views/new_task_manager_view.cc
index 8afec24..fbcdc1e 100644
--- a/chrome/browser/ui/views/new_task_manager_view.cc
+++ b/chrome/browser/ui/views/new_task_manager_view.cc
@@ -183,8 +183,8 @@ class TaskManagerValuesStringifier {
 
   base::string16 GetWindowsHandlesText(int64 current, int64 peak) {
     return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT,
-                                      base::IntToString16(current),
-                                      base::IntToString16(peak));
+                                      base::Int64ToString16(current),
+                                      base::Int64ToString16(peak));
   }
 
   base::string16 GetNetworkUsageText(int64 network_usage) {
@@ -1243,4 +1243,3 @@ void NewTaskManagerView::ToggleColumnVisibility(int column_id) {
 }
 
 }  // namespace task_management
-
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 6c96c33..248d5f4 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -872,11 +872,11 @@ void AboutMemoryHandler::OnDetailsAvailable() {
     if (!log_string.empty())
       log_string += base::ASCIIToUTF16(", ");
     log_string += browser_processes[index].name + base::ASCIIToUTF16(", ") +
-                  base::Int64ToString16(aggregate.working_set.priv) +
+                  base::SizeTToString16(aggregate.working_set.priv) +
                   base::ASCIIToUTF16(", ") +
-                  base::Int64ToString16(aggregate.working_set.shared) +
+                  base::SizeTToString16(aggregate.working_set.shared) +
                   base::ASCIIToUTF16(", ") +
-                  base::Int64ToString16(aggregate.working_set.shareable);
+                  base::SizeTToString16(aggregate.working_set.shareable);
   }
   if (!log_string.empty())
     VLOG(1) << "memory: " << log_string;
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index ebb0eba..0822a72 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -179,8 +179,8 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
 
   size_t num_after = registry->enabled_extensions().size();
   if (num_before + 1 != num_after) {
-    VLOG(1) << "Num extensions before: " << base::IntToString(num_before)
-            << " num after: " << base::IntToString(num_after)
+    VLOG(1) << "Num extensions before: " << base::SizeTToString(num_before)
+            << " num after: " << base::SizeTToString(num_after)
             << " Installed extensions follow:";
 
     for (const scoped_refptr<const Extension>& extension :
diff --git a/chrome/common/extensions/api/plugins/plugins_handler.cc b/chrome/common/extensions/api/plugins/plugins_handler.cc
index 2794874..6cb2cac 100644
--- a/chrome/common/extensions/api/plugins/plugins_handler.cc
+++ b/chrome/common/extensions/api/plugins/plugins_handler.cc
@@ -85,7 +85,7 @@ bool PluginsHandler::Parse(Extension* extension, base::string16* error) {
     std::string path_str;
     if (!plugin_value->GetString(keys::kPluginsPath, &path_str)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
-          manifest_errors::kInvalidPluginsPath, base::IntToString(i));
+          manifest_errors::kInvalidPluginsPath, base::SizeTToString(i));
       return false;
     }
 
@@ -94,8 +94,7 @@ bool PluginsHandler::Parse(Extension* extension, base::string16* error) {
     if (plugin_value->HasKey(keys::kPluginsPublic)) {
       if (!plugin_value->GetBoolean(keys::kPluginsPublic, &is_public)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            manifest_errors::kInvalidPluginsPublic,
-            base::IntToString(i));
+            manifest_errors::kInvalidPluginsPublic, base::SizeTToString(i));
         return false;
       }
     }
diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
index 6098eac..d2d7131 100644
--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
@@ -57,10 +57,8 @@ bool LoadGlobsHelper(const base::DictionaryValue* content_script,
     std::string glob;
     if (!list->GetString(i, &glob)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
-          errors::kInvalidGlob,
-          base::IntToString(content_script_index),
-          globs_property_name,
-          base::IntToString(i));
+          errors::kInvalidGlob, base::IntToString(content_script_index),
+          globs_property_name, base::SizeTToString(i));
       return false;
     }
 
@@ -143,10 +141,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
     std::string match_str;
     if (!matches->GetString(j, &match_str)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
-          errors::kInvalidMatch,
-          base::IntToString(definition_index),
-          base::IntToString(j),
-          errors::kExpectString);
+          errors::kInvalidMatch, base::IntToString(definition_index),
+          base::SizeTToString(j), errors::kExpectString);
       return false;
     }
 
@@ -156,9 +152,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
     URLPattern::ParseResult parse_result = pattern.Parse(match_str);
     if (parse_result != URLPattern::PARSE_SUCCESS) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
-          errors::kInvalidMatch,
-          base::IntToString(definition_index),
-          base::IntToString(j),
+          errors::kInvalidMatch, base::IntToString(definition_index),
+          base::SizeTToString(j),
           URLPattern::GetParseResultString(parse_result));
       return false;
     }
@@ -200,10 +195,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
       std::string match_str;
       if (!exclude_matches->GetString(j, &match_str)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidExcludeMatch,
-            base::IntToString(definition_index),
-            base::IntToString(j),
-            errors::kExpectString);
+            errors::kInvalidExcludeMatch, base::IntToString(definition_index),
+            base::SizeTToString(j), errors::kExpectString);
         return false;
       }
 
@@ -214,8 +207,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
       URLPattern::ParseResult parse_result = pattern.Parse(match_str);
       if (parse_result != URLPattern::PARSE_SUCCESS) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidExcludeMatch,
-            base::IntToString(definition_index), base::IntToString(j),
+            errors::kInvalidExcludeMatch, base::IntToString(definition_index),
+            base::SizeTToString(j),
             URLPattern::GetParseResultString(parse_result));
         return false;
       }
@@ -269,9 +262,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
       std::string relative;
       if (!js->Get(script_index, &value) || !value->GetAsString(&relative)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidJs,
-            base::IntToString(definition_index),
-            base::IntToString(script_index));
+            errors::kInvalidJs, base::IntToString(definition_index),
+            base::SizeTToString(script_index));
         return false;
       }
       GURL url = extension->GetResourceURL(relative);
@@ -288,9 +280,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
       std::string relative;
       if (!css->Get(script_index, &value) || !value->GetAsString(&relative)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidCss,
-            base::IntToString(definition_index),
-            base::IntToString(script_index));
+            errors::kInvalidCss, base::IntToString(definition_index),
+            base::SizeTToString(script_index));
         return false;
       }
       GURL url = extension->GetResourceURL(relative);
@@ -406,8 +397,7 @@ bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {
     const base::DictionaryValue* script_dict = NULL;
     if (!scripts_list->GetDictionary(i, &script_dict)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
-          errors::kInvalidContentScript,
-          base::IntToString(i));
+          errors::kInvalidContentScript, base::SizeTToString(i));
       return false;
     }
 
diff --git a/chrome/common/net/x509_certificate_model_nss.cc b/chrome/common/net/x509_certificate_model_nss.cc
index 7f9b343..b34a86a 100644
--- a/chrome/common/net/x509_certificate_model_nss.cc
+++ b/chrome/common/net/x509_certificate_model_nss.cc
@@ -14,6 +14,7 @@
 #include <sechash.h>
 
 #include "base/logging.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h"
@@ -125,7 +126,7 @@ string GetVersion(X509Certificate::OSCertHandle cert_handle) {
   unsigned long version = 0;
   if (cert_handle->version.len == 0 ||
       SEC_ASN1DecodeInteger(&cert_handle->version, &version) == SECSuccess) {
-    return base::UintToString(version + 1);
+    return base::Uint64ToString(base::strict_cast<uint64>(version + 1));
   }
   return std::string();
 }
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 082cf0d..a3c3b4b 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, Navigation) {
 
   // Test an initial load.  We expect classification to happen normally.
   EXPECT_CALL(*classifier_, CancelPendingClassification()).Times(2);
-  std::string port = base::IntToString(embedded_test_server_->port());
+  std::string port = base::UintToString(embedded_test_server_->port());
   std::string html = "<html><body><iframe src=\"http://sub1.com:";
   html += port;
   html += "/\"></iframe></body></html>";
@@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest,
   Mock::VerifyAndClearExpectations(classifier_);
 
   std::string url_str = "http://host4.com:";
-  url_str += base::IntToString(embedded_test_server_->port());
+  url_str += base::UintToString(embedded_test_server_->port());
   url_str += "/redir";
   OnStartPhishingDetection(GURL(url_str));
   page_text = ASCIIToUTF16("123");
diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
index 6719fe8f..b2645eb 100644
--- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
@@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, FormFeatures) {
       std::string("http://other.com/"));
   expected_features.AddBooleanFeature(features::kPageActionURL +
       std::string("http://host.com:") +
-      base::IntToString(embedded_test_server_->port()) +
+      base::UintToString(embedded_test_server_->port()) +
       std::string("/query"));
 
   FeatureMap features;
@@ -289,7 +289,7 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, LinkFeatures) {
   // The PhishingDOMFeatureExtractor depends on URLs being domains and not IPs,
   // so use a domain.
   std::string url_str = "https://host.com:";
-  url_str += base::IntToString(https_server.host_port_pair().port());
+  url_str += base::UintToString(https_server.host_port_pair().port());
   url_str += "/files/safe_browsing/secure_link_features.html";
   ui_test_utils::NavigateToURL(browser(), GURL(url_str));
 
@@ -340,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest,
   // The PhishingDOMFeatureExtractor depends on URLs being domains and not IPs,
   // so use a domain.
   std::string url_str = "https://host.com:";
-  url_str += base::IntToString(https_server.host_port_pair().port());
+  url_str += base::UintToString(https_server.host_port_pair().port());
   url_str += "/files/safe_browsing/secure_script_and_image.html";
   ui_test_utils::NavigateToURL(browser(), GURL(url_str));
 
@@ -360,7 +360,7 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, SubFrames) {
 
   // Test that features are aggregated across all frames.
 
-  std::string port = base::IntToString(embedded_test_server_->port());
+  std::string port = base::UintToString(embedded_test_server_->port());
   responses_[GetURL("host2.com", "").spec()] =
       "<html><head><script></script><body>"
       "<form action=\"http://host4.com/\"><input type=checkbox></form>"
@@ -474,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, MAYBE_Continuation) {
   expected_features.AddRealFeature(features::kPageActionOtherDomainFreq, 0.5);
   expected_features.AddBooleanFeature(features::kPageActionURL +
       std::string("http://host.com:") +
-      base::IntToString(embedded_test_server_->port()) +
+      base::UintToString(embedded_test_server_->port()) +
       std::string("/ondomain"));
   expected_features.AddBooleanFeature(features::kPageActionURL +
       std::string("http://host2.com/"));
diff --git a/chrome/test/chromedriver/chrome/device_manager.cc b/chrome/test/chromedriver/chrome/device_manager.cc
index 8a9206d..c8c9736 100644
--- a/chrome/test/chromedriver/chrome/device_manager.cc
+++ b/chrome/test/chromedriver/chrome/device_manager.cc
@@ -163,7 +163,7 @@ Status DeviceManager::AcquireDevice(scoped_ptr<Device>* device) {
 
   base::AutoLock lock(devices_lock_);
   status = Status(kUnknownError, "All devices are in use (" +
-                  base::IntToString(devices.size()) + " online)");
+                  base::SizeTToString(devices.size()) + " online)");
   std::vector<std::string>::iterator iter;
   for (iter = devices.begin(); iter != devices.end(); iter++) {
     if (!IsDeviceLocked(*iter)) {
@@ -213,4 +213,3 @@ bool DeviceManager::IsDeviceLocked(const std::string& device_serial) {
   return std::find(active_devices_.begin(), active_devices_.end(),
                    device_serial) != active_devices_.end();
 }
-
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc
index be302dc..57bec26 100644
--- a/chrome/test/chromedriver/chrome_launcher.cc
+++ b/chrome/test/chromedriver/chrome_launcher.cc
@@ -135,7 +135,7 @@ Status PrepareCommandLine(uint16 port,
     switches.SetUnparsedSwitch(common_switch);
   for (const auto& desktop_switch : kDesktopSwitches)
     switches.SetUnparsedSwitch(desktop_switch);
-  switches.SetSwitch("remote-debugging-port", base::IntToString(port));
+  switches.SetSwitch("remote-debugging-port", base::UintToString(port));
   for (const auto& excluded_switch : capabilities.exclude_switches) {
     switches.RemoveSwitch(excluded_switch);
   }
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index 563fae6..b1507ff 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -678,7 +678,7 @@ std::string ProcessUserNotice(SECItem* der_notice) {
         if (itemList != notice->noticeReference.noticeNumbers)
           rv += ", ";
         rv += '#';
-        rv += base::UTF16ToUTF8(base::UintToString16(number));
+        rv += base::UTF16ToUTF8(base::Uint64ToString16(number));
       }
       itemList++;
     }