Remove base::SizeToToString[16]

Convert to overloaded variant base::NumberToString

Add SECURITY_OWNERS owner for
components/network_hints/common/network_hints_messages.cc

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I1bae6619c1da5c1cf32cbbdc2fe82946e355d74f
Reviewed-on: https://chromium-review.googlesource.com/799550
Commit-Queue: Brett Wilson <brettw@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520710}

base/strings/string_number_conversions.h

@@ -91,12 +91,6 @@ inline std::string Uint64ToString(uint64_t value) {
 inline string16 Uint64ToString16(uint64_t value) {
   return NumberToString16(value);
 }
-inline std::string SizeTToString(size_t value) {
-  return NumberToString(value);
-}
-inline string16 SizeTToString16(size_t value) {
-  return NumberToString16(value);
-}
 inline std::string DoubleToString(double value) {
   return NumberToString(value);
 }

chrome/browser/autocomplete/search_provider_unittest.cc

@@ -488,14 +488,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::SizeTToString(i));
+    SCOPED_TRACE(" Case # " + base::NumberToString(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::SizeTToString(i));
+    SCOPED_TRACE(" Case # " + base::NumberToString(i));
     EXPECT_EQ(kNotApplicable, expected_matches[i].contents);
   }
 }
@@ -1976,7 +1976,7 @@ TEST_F(SearchProviderTest, KeywordFetcherSuggestRelevance) {
     }
     // Ensure that no expected matches are missing.
     for (; j < arraysize(cases[i].matches); ++j) {
-      SCOPED_TRACE(" Case # " + base::SizeTToString(i));
+      SCOPED_TRACE(" Case # " + base::NumberToString(i));
       EXPECT_EQ(kNotApplicable, cases[i].matches[j].contents);
     }
   }
@@ -2879,7 +2879,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::SizeTToString(j));
+      SCOPED_TRACE(" and match index: " + base::NumberToString(j));
       EXPECT_EQ(match.contents,
                 base::UTF16ToUTF8(matches[j].contents));
       EXPECT_EQ(match.description,
@@ -2892,7 +2892,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::SizeTToString(j));
+      SCOPED_TRACE(" and match index: " + base::NumberToString(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);
@@ -3098,18 +3098,18 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_ValidResponses) {
     ASSERT_FALSE(matches.empty());
     EXPECT_GE(matches[0].relevance, 1300);
 
-    SCOPED_TRACE("for case: " + base::SizeTToString(i));
+    SCOPED_TRACE("for case: " + base::NumberToString(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::SizeTToString(j));
+      SCOPED_TRACE("and match: " + base::NumberToString(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::SizeTToString(j));
+      SCOPED_TRACE("and match: " + base::NumberToString(j));
       EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable);
       EXPECT_EQ(cases[i].matches[j].type, AutocompleteMatchType::NUM_TYPES);
     }
@@ -3206,7 +3206,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::SizeTToString(j));
+         SCOPED_TRACE(" and match index: " + base::NumberToString(j));
          EXPECT_EQ(match.contents, base::UTF16ToUTF8(matches[j].contents));
          EXPECT_EQ(match.deletion_url, matches[j].GetAdditionalInfo(
              "deletion_url"));

chrome/browser/extensions/alert_apitest.cc

@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertQueue) {
   const size_t num_dialogs = 3;
   size_t call_count = 0;
   for (size_t i = 0; i != num_dialogs; ++i) {
-    const std::string dialog_name = "Dialog #" + base::SizeTToString(i) + ".";
+    const std::string dialog_name = "Dialog #" + base::NumberToString(i) + ".";
     host->host_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("alert('" + dialog_name + "');"),
         base::Bind(&CheckAlertResult, dialog_name,
@@ -133,15 +133,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ConfirmQueue) {
   size_t call_count = 0;
   for (size_t i = 0; i != num_accepted_dialogs; ++i) {
     const std::string dialog_name =
-        "Accepted dialog #" + base::SizeTToString(i) + ".";
+        "Accepted dialog #" + base::NumberToString(i) + ".";
     host->host_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("confirm('" + dialog_name + "');"),
         base::Bind(&CheckConfirmResult, dialog_name, true,
                    base::Unretained(&call_count)));
   }
   for (size_t i = 0; i != num_cancelled_dialogs; ++i) {
     const std::string dialog_name =
-        "Cancelled dialog #" + base::SizeTToString(i) + ".";
+        "Cancelled dialog #" + base::NumberToString(i) + ".";
     host->host_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
         base::ASCIIToUTF16("confirm('" + dialog_name + "');"),
         base::Bind(&CheckConfirmResult, dialog_name, false,

chrome/browser/extensions/chrome_url_request_util.cc

@@ -65,7 +65,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::SizeTToString((*data)->size()).c_str()));
+                           base::NumberToString((*data)->size()).c_str()));
 
     std::string* read_mime_type = new std::string;
     base::PostTaskWithTraitsAndReplyWithResult(

chrome/browser/extensions/error_console/error_console_unittest.cc

@@ -154,7 +154,7 @@ TEST_F(ErrorConsoleUnitTest, ReportErrors) {
 
   for (size_t i = 0; i < kNumTotalErrors; ++i) {
     error_console_->ReportError(
-        CreateNewManifestError(kId, base::SizeTToString(i)));
+        CreateNewManifestError(kId, base::NumberToString(i)));
   }
 
   ASSERT_EQ(kNumTotalErrors, error_console_->GetErrorsForExtension(kId).size());

chrome/browser/extensions/extension_browsertest.cc

@@ -490,8 +490,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::SizeTToString(num_before)
-            << " num after: " << base::SizeTToString(num_after)
+    VLOG(1) << "Num extensions before: " << base::NumberToString(num_before)
+            << " num after: " << base::NumberToString(num_after)
             << " Installed extensions follow:";
 
     for (const scoped_refptr<const Extension>& extension :

chrome/browser/importer/profile_writer.cc

@@ -66,7 +66,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::SizeTToString16(i) + base::ASCIIToUTF16(")");
+                          base::NumberToString16(i) + base::ASCIIToUTF16(")");
     if (existing_folder_names.find(name) == existing_folder_names.end())
       return name;
   }

chrome/browser/media/webrtc/webrtc_browsertest_base.cc

@@ -582,15 +582,15 @@ void WebRtcTestBase::CreateAndAddStreams(content::WebContents* tab,
   EXPECT_EQ(
       "ok-streams-created-and-added",
       ExecuteJavascript(
-          "createAndAddStreams(" + base::SizeTToString(count) + ")", tab));
+          "createAndAddStreams(" + base::NumberToString(count) + ")", tab));
 }
 
 void WebRtcTestBase::VerifyRtpSenders(
     content::WebContents* tab,
     base::Optional<size_t> expected_num_tracks) const {
   std::string javascript =
       expected_num_tracks ? "verifyRtpSenders(" +
-                                base::SizeTToString(*expected_num_tracks) + ")"
+                                base::NumberToString(*expected_num_tracks) + ")"
                           : "verifyRtpSenders()";
   EXPECT_EQ("ok-senders-verified", ExecuteJavascript(javascript, tab));
 }
@@ -600,7 +600,7 @@ void WebRtcTestBase::VerifyRtpReceivers(
     base::Optional<size_t> expected_num_tracks) const {
   std::string javascript =
       expected_num_tracks ? "verifyRtpReceivers(" +
-                                base::SizeTToString(*expected_num_tracks) + ")"
+                                base::NumberToString(*expected_num_tracks) + ")"
                           : "verifyRtpReceivers()";
   EXPECT_EQ("ok-receivers-verified", ExecuteJavascript(javascript, tab));
 }

chrome/browser/media/webrtc/webrtc_text_log_handler.cc

@@ -453,7 +453,8 @@ void WebRtcTextLogHandler::LogInitialInfoOnIOThread(
       "Audio manager: %s", media::AudioManager::Get()->GetName()));
 
   // Network interfaces
-  LogToCircularBuffer("Discovered " + base::SizeTToString(network_list.size()) +
+  LogToCircularBuffer("Discovered " +
+                      base::NumberToString(network_list.size()) +
                       " network interfaces:");
   for (const auto& network : network_list) {
     LogToCircularBuffer(

chrome/browser/notifications/notification_platform_bridge_linux.cc

@@ -605,7 +605,7 @@ class NotificationPlatformBridgeLinuxImpl
         // FDO notification buttons can contain either an icon or a label,
         // but not both, and the type of all buttons must be the same (all
         // labels or all icons), so always use labels.
-        const std::string id = base::SizeTToString(data->action_end++);
+        const std::string id = base::NumberToString(data->action_end++);
         const std::string label = base::UTF16ToUTF8(button_info.title);
         actions.push_back(id);
         actions.push_back(label);

chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc

@@ -30,7 +30,7 @@ void RecordSignatureVerificationTime(size_t file_index,
 
   base::HistogramBase* signature_verification_time_histogram =
       base::Histogram::FactoryTimeGet(
-          std::string(kHistogramName) + base::SizeTToString(file_index),
+          std::string(kHistogramName) + base::NumberToString(file_index),
           base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromSeconds(20), 50,
           base::Histogram::kUmaTargetedHistogramFlag);

chrome/browser/sessions/persistent_tab_restore_service_unittest.cc

@@ -730,7 +730,7 @@ TEST_F(PersistentTabRestoreServiceTest, PruneEntries) {
     SerializedNavigationEntry navigation =
         SerializedNavigationEntryTestHelper::CreateNavigation(
             base::StringPrintf("http://%d", static_cast<int>(i)),
-            base::SizeTToString(i));
+            base::NumberToString(i));
 
     auto tab = base::MakeUnique<Tab>();
     tab->navigations.push_back(navigation);

chrome/browser/shell_integration_linux.cc

@@ -743,7 +743,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::SizeTToString(i) + ".desktop");
+          filepath.value() + "_" + base::NumberToString(i) + ".desktop");
     } else {
       return base::FilePath(alternative_filepath).BaseName();
     }

chrome/browser/signin/easy_unlock_screenlock_state_handler_unittest.cc

@@ -361,7 +361,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest, StatesWithLockedIcon) {
   states.push_back(ScreenlockState::PHONE_LOCKED);
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::SizeTToString(i));
+    SCOPED_TRACE(base::NumberToString(i));
     state_handler_->ChangeState(states[i]);
     EXPECT_TRUE(state_handler_->IsActive());
 
@@ -477,7 +477,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest,
   states.push_back(ScreenlockState::AUTHENTICATED);
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::SizeTToString(i));
+    SCOPED_TRACE(base::NumberToString(i));
     state_handler_->ChangeState(states[i]);
     ASSERT_TRUE(lock_handler_->HasCustomIcon());
     EXPECT_FALSE(lock_handler_->CustomIconHardlocksOnClick());
@@ -488,7 +488,7 @@ TEST_F(EasyUnlockScreenlockStateHandlerTest,
   proximity_auth::ScreenlockBridge::Get()->SetLockHandler(lock_handler_.get());
 
   for (size_t i = 0; i < states.size(); ++i) {
-    SCOPED_TRACE(base::SizeTToString(i));
+    SCOPED_TRACE(base::NumberToString(i));
     state_handler_->ChangeState(states[i]);
     ASSERT_TRUE(lock_handler_->HasCustomIcon());
     EXPECT_TRUE(lock_handler_->CustomIconHardlocksOnClick());

chrome/browser/subresource_filter/test_ruleset_publisher.cc

@@ -45,7 +45,7 @@ TestRulesetPublisher::TestRulesetPublisher() = default;
 TestRulesetPublisher::~TestRulesetPublisher() = default;
 
 void TestRulesetPublisher::SetRuleset(const TestRuleset& unindexed_ruleset) {
-  const std::string& test_ruleset_content_version(base::SizeTToString(
+  const std::string& test_ruleset_content_version(base::NumberToString(
       base::Hash(std::string(unindexed_ruleset.contents.begin(),
                              unindexed_ruleset.contents.end()))));
   subresource_filter::UnindexedRulesetInfo unindexed_ruleset_info;

chrome/browser/sync/test/integration/sync_arc_package_helper.cc

@@ -24,7 +24,7 @@ namespace arc {
 namespace {
 
 std::string GetTestPackageName(size_t id) {
-  return "testarcpackage" + base::SizeTToString(id);
+  return "testarcpackage" + base::NumberToString(id);
 }
 
 }  // namespace

chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc

@@ -49,7 +49,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::SizeTToString(i));
+          db->Put(leveldb::WriteOptions(), keys[i], base::NumberToString(i));
       ASSERT_TRUE(status.ok());
     }
   }

chrome/browser/ui/app_list/search/history_unittest.cc

@@ -241,7 +241,7 @@ TEST_F(SearchHistoryTest, PromoteSecondary) {
 
 TEST_F(SearchHistoryTest, MaxPrimary) {
   for (size_t i = 0; i < kMaxPrimary; ++i) {
-    std::string query = base::SizeTToString(i);
+    std::string query = base::NumberToString(i);
     history()->AddLaunchEvent(query, "app");
   }
   EXPECT_EQ(kMaxPrimary, associations().size());
@@ -275,7 +275,7 @@ TEST_F(SearchHistoryTest, MaxSecondary) {
   const char kQuery[] = "query";
   history()->AddLaunchEvent(kQuery, "primary");
   for (size_t i = 0; i < kMaxSecondary; ++i) {
-    std::string result_id = base::SizeTToString(i);
+    std::string result_id = base::NumberToString(i);
     history()->AddLaunchEvent(kQuery, result_id);
   }
 

chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc

@@ -102,7 +102,7 @@ bool ShouldOpenAll(gfx::NativeWindow parent,
   return ShowQuestionMessageBox(
              parent, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
              l10n_util::GetStringFUTF16(IDS_BOOKMARK_BAR_SHOULD_OPEN_ALL,
-                                        base::SizeTToString16(child_count))) ==
+                                        base::NumberToString16(child_count))) ==
          MESSAGE_BOX_RESULT_YES;
 }
 #endif
@@ -122,7 +122,7 @@ int ChildURLCountTotal(const BookmarkNode* node) {
 #if !defined(OS_ANDROID)
 // Returns in |urls|, the url and title pairs for each open tab in browser.
 void GetURLsForOpenTabs(Browser* browser,
-                        std::vector<std::pair<GURL, base::string16> >* urls) {
+                        std::vector<std::pair<GURL, base::string16>>* urls) {
   for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
     std::pair<GURL, base::string16> entry;
     GetURLAndTitleToBookmark(browser->tab_strip_model()->GetWebContentsAt(i),

chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc

@@ -35,7 +35,7 @@ namespace {
 
 std::string GetHash(const base::FilePath& relative_path) {
   size_t int_key = BASE_HASH_NAMESPACE::hash<base::FilePath>()(relative_path);
-  return base::SizeTToString(int_key);
+  return base::NumberToString(int_key);
 }
 
 std::string GetPartitionKey(const base::FilePath& relative_path) {
@@ -209,7 +209,7 @@ void ChromeZoomLevelPrefs::MigrateOldZoomPreferences(
   // ones (above), so that the precedence is: new settings, libc++
   // settings, libstdc++ settings.
   if (GetLibstdcppHashBytesFunction()) {
-    MigrateOldZoomPreferencesForKeys(base::SizeTToString(LibstdcppHashString(
+    MigrateOldZoomPreferencesForKeys(base::NumberToString(LibstdcppHashString(
                                          partition_relative_path.value())),
                                      GetPartitionKey(partition_relative_path));
   }

chrome/browser/win/enumerate_modules_model.cc

@@ -433,11 +433,11 @@ void ModuleEnumerator::ReportThirdPartyMetrics() {
   // the regular user distribution.
   static crash_reporter::CrashKeyString<32> third_party_loaded_key(
       "third-party-modules-loaded");
-  third_party_loaded_key.Set(base::SizeTToString(third_party_loaded));
+  third_party_loaded_key.Set(base::NumberToString(third_party_loaded));
 
   static crash_reporter::CrashKeyString<32> third_party_not_loaded_key(
       "third-party-modules-not-loaded");
-  third_party_not_loaded_key.Set(base::SizeTToString(third_party_not_loaded));
+  third_party_not_loaded_key.Set(base::NumberToString(third_party_not_loaded));
 
   // Report back some metrics regarding third party modules and certificates.
   UMA_HISTOGRAM_CUSTOM_COUNTS("ThirdPartyModules.Certificates.Total",