Tidy up *Int*ToString conversions in //net

Use the appropriate variant of IntToString() for the type that is being
converted. These changes make no functional difference.

BUG=505479
TEST=net_unittests

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

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

11 files changed, 21 insertions, 20 deletions

diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
index cd56089..3c40be9 100644
--- a/net/base/host_port_pair.cc
+++ b/net/base/host_port_pair.cc
@@ -50,7 +50,7 @@ HostPortPair HostPortPair::FromString(const std::string& str) {
 std::string HostPortPair::ToString() const {
   std::string ret(HostForURL());
   ret += ':';
-  ret += base::IntToString(port_);
+  ret += base::UintToString(port_);
   return ret;
 }
 
diff --git a/net/base/ip_endpoint_unittest.cc b/net/base/ip_endpoint_unittest.cc
index 2b5b83e..5266ea6 100644
--- a/net/base/ip_endpoint_unittest.cc
+++ b/net/base/ip_endpoint_unittest.cc
@@ -163,7 +163,7 @@ TEST_F(IPEndPointTest, ToString) {
     uint16_t port = 100 + index;
     IPEndPoint endpoint(tests[index].ip_address, port);
     const std::string result = endpoint.ToString();
-    EXPECT_EQ(tests[index].host_normalized + ":" + base::IntToString(port),
+    EXPECT_EQ(tests[index].host_normalized + ":" + base::UintToString(port),
               result);
   }
 }
diff --git a/net/base/network_activity_monitor_unittest.cc b/net/base/network_activity_monitor_unittest.cc
index e953a83..78b4521 100644
--- a/net/base/network_activity_monitor_unittest.cc
+++ b/net/base/network_activity_monitor_unittest.cc
@@ -96,7 +96,7 @@ void IncrementBytesSent(uint64_t bytes) {
 TEST_F(NetworkActivityMontiorTest, Threading) {
   std::vector<base::Thread*> threads;
   for (size_t i = 0; i < 3; ++i) {
-    threads.push_back(new base::Thread(base::UintToString(i)));
+    threads.push_back(new base::Thread(base::SizeTToString(i)));
     ASSERT_TRUE(threads.back()->Start());
   }
 
diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc
index 892153c..3eb1fa2 100644
--- a/net/ftp/ftp_auth_cache_unittest.cc
+++ b/net/ftp/ftp_auth_cache_unittest.cc
@@ -138,13 +138,13 @@ TEST(FtpAuthCacheTest, EvictOldEntries) {
   FtpAuthCache cache;
 
   for (size_t i = 0; i < FtpAuthCache::kMaxEntries; i++) {
-    cache.Add(GURL("ftp://host" + base::IntToString(i)),
+    cache.Add(GURL("ftp://host" + base::SizeTToString(i)),
               AuthCredentials(kUsername, kPassword));
   }
 
   // No entries should be evicted before reaching the limit.
   for (size_t i = 0; i < FtpAuthCache::kMaxEntries; i++) {
-    EXPECT_TRUE(cache.Lookup(GURL("ftp://host" + base::IntToString(i))));
+    EXPECT_TRUE(cache.Lookup(GURL("ftp://host" + base::SizeTToString(i))));
   }
 
   // Adding one entry should cause eviction of the first entry.
@@ -153,7 +153,7 @@ TEST(FtpAuthCacheTest, EvictOldEntries) {
 
   // Remaining entries should not get evicted.
   for (size_t i = 1; i < FtpAuthCache::kMaxEntries; i++) {
-    EXPECT_TRUE(cache.Lookup(GURL("ftp://host" + base::IntToString(i))));
+    EXPECT_TRUE(cache.Lookup(GURL("ftp://host" + base::SizeTToString(i))));
   }
   EXPECT_TRUE(cache.Lookup(GURL("ftp://last_host")));
 }
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index cfc2fd7d..2ffe507 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -105,7 +105,7 @@ GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules && mapping_rules->RewriteHost(endpoint)) {
     url::Replacements<char> replacements;
-    const std::string port_str = base::IntToString(endpoint->port());
+    const std::string port_str = base::UintToString(endpoint->port());
     replacements.SetPort(port_str.c_str(), url::Component(0, port_str.size()));
     replacements.SetHost(endpoint->host().c_str(),
                          url::Component(0, endpoint->host().size()));
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 9373e18..0045499 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -713,7 +713,7 @@ int HttpStreamFactoryImpl::Job::DoResolveProxy() {
     GURL::Replacements replacements;
     // new_port needs to be in scope here because GURL::Replacements references
     // the memory contained by it directly.
-    const std::string new_port = base::IntToString(alternative_service_.port);
+    const std::string new_port = base::UintToString(alternative_service_.port);
     replacements.SetSchemeStr("https");
     replacements.SetPortStr(new_port);
     url_for_proxy = url_for_proxy.ReplaceComponents(replacements);
diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc
index 05e1e9357..a2dde4e 100644
--- a/net/quic/quic_client_session.cc
+++ b/net/quic/quic_client_session.cc
@@ -842,8 +842,8 @@ scoped_ptr<base::Value> QuicClientSession::GetInfoAsValue(
   for (base::hash_map<QuicStreamId, ReliableQuicStream*>::const_iterator it =
            dynamic_streams().begin();
        it != dynamic_streams().end(); ++it) {
-    stream_list->Append(new base::StringValue(
-        base::Uint64ToString(it->second->id())));
+    stream_list->Append(
+        new base::StringValue(base::UintToString(it->second->id())));
   }
   dict->Set("active_streams", stream_list.Pass());
 
diff --git a/net/spdy/spdy_headers_block_parser_test.cc b/net/spdy/spdy_headers_block_parser_test.cc
index dafaff8..b835a62 100644
--- a/net/spdy/spdy_headers_block_parser_test.cc
+++ b/net/spdy/spdy_headers_block_parser_test.cc
@@ -17,6 +17,7 @@ namespace net {
 
 using base::IntToString;
 using base::StringPiece;
+using base::UintToString;
 using std::string;
 
 // A mock the handler class to check that we parse out the correct headers
@@ -55,9 +56,9 @@ class SpdyHeadersBlockParserTest :
       // Build the key.
       string key;
       if (insert_nulls) {
-        key = string(kBaseKey) + string("\0", 1) + IntToString(i);
+        key = string(kBaseKey) + string("\0", 1) + UintToString(i);
       } else {
-        key = string(kBaseKey) + IntToString(i);
+        key = string(kBaseKey) + UintToString(i);
       }
       // Encode the key as SPDY header.
       headers += EncodeLength(key.length());
@@ -66,9 +67,9 @@ class SpdyHeadersBlockParserTest :
       // Build the value.
       string value;
       if (insert_nulls) {
-        value = string(kBaseValue) + string("\0", 1) + IntToString(i);
+        value = string(kBaseValue) + string("\0", 1) + UintToString(i);
       } else {
-        value = string(kBaseValue) + IntToString(i);
+        value = string(kBaseValue) + UintToString(i);
       }
       // Encode the value as SPDY header.
       headers += EncodeLength(value.length());
diff --git a/net/test/spawned_test_server/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc
index c770152..2899c90 100644
--- a/net/test/spawned_test_server/local_test_server_posix.cc
+++ b/net/test/spawned_test_server/local_test_server_posix.cc
@@ -130,7 +130,7 @@ bool LocalTestServer::LaunchPython(const base::FilePath& testserver_path) {
 
   // Try to kill any orphaned testserver processes that may be running.
   OrphanedTestServerFilter filter(testserver_path.value(),
-                                  base::IntToString(GetPort()));
+                                  base::UintToString(GetPort()));
   if (!base::KillProcesses("python", -1, &filter)) {
     LOG(WARNING) << "Failed to clean up older orphaned testserver instances.";
   }
diff --git a/net/tools/quic/test_tools/http_message.cc b/net/tools/quic/test_tools/http_message.cc
index cb32255..ad13f5c 100644
--- a/net/tools/quic/test_tools/http_message.cc
+++ b/net/tools/quic/test_tools/http_message.cc
@@ -141,7 +141,7 @@ void HTTPMessage::AddBody(const string& body, bool add_content_length) {
   // Remove any transfer-encoding that was left by a previous body.
   RemoveHeader(kTransferCoding);
   if (add_content_length) {
-    ReplaceHeader(kContentLength, base::IntToString(body.size()));
+    ReplaceHeader(kContentLength, base::SizeTToString(body.size()));
   } else {
     RemoveHeader(kContentLength);
   }
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 6b09473..2c0af0b 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2846,7 +2846,7 @@ class URLRequestTestHTTP : public URLRequestTest {
       req->set_upload(CreateSimpleUploadData(kData));
       HttpRequestHeaders headers;
       headers.SetHeader(HttpRequestHeaders::kContentLength,
-                        base::UintToString(arraysize(kData) - 1));
+                        base::SizeTToString(arraysize(kData) - 1));
       req->SetExtraRequestHeaders(headers);
     }
     req->Start();
@@ -3347,7 +3347,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestPost) {
     r->set_upload(CreateSimpleUploadData(kData));
     HttpRequestHeaders headers;
     headers.SetHeader(HttpRequestHeaders::kContentLength,
-                      base::UintToString(arraysize(kData) - 1));
+                      base::SizeTToString(arraysize(kData) - 1));
     r->SetExtraRequestHeaders(headers);
 
     // Quit after hitting the redirect, so can check the headers.
@@ -6561,7 +6561,7 @@ TEST_F(URLRequestTestHTTP, InterceptPost302RedirectGet) {
   req->set_upload(CreateSimpleUploadData(kData));
   HttpRequestHeaders headers;
   headers.SetHeader(HttpRequestHeaders::kContentLength,
-                    base::UintToString(arraysize(kData) - 1));
+                    base::SizeTToString(arraysize(kData) - 1));
   req->SetExtraRequestHeaders(headers);
 
   URLRequestRedirectJob* job = new URLRequestRedirectJob(
@@ -6586,7 +6586,7 @@ TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) {
   req->set_upload(CreateSimpleUploadData(kData));
   HttpRequestHeaders headers;
   headers.SetHeader(HttpRequestHeaders::kContentLength,
-                    base::UintToString(arraysize(kData) - 1));
+                    base::SizeTToString(arraysize(kData) - 1));
   req->SetExtraRequestHeaders(headers);
 
   URLRequestRedirectJob* job = new URLRequestRedirectJob(