net: Append base:: in the StringPrintf calls.

(Note: This is a TODO in string_util.h)

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/3390026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60555 0039d316-1c4b-4281-b951-d872f2087c98

net/base/cookie_monster.cc

@@ -53,6 +53,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "net/base/net_util.h"
@@ -216,12 +217,12 @@ void CookieMonster::InitStore() {
     if (creation_times.insert(cookie_creation_time).second) {
       InternalInsertCookie(GetKey((*it)->Domain()), *it, false);
     } else {
-      LOG(ERROR) << StringPrintf("Found cookies with duplicate creation "
-                                 "times in backing store: "
-                                 "{name='%s', domain='%s', path='%s'}",
-                                 (*it)->Name().c_str(),
-                                 (*it)->Domain().c_str(),
-                                 (*it)->Path().c_str());
+      LOG(ERROR) << base::StringPrintf("Found cookies with duplicate creation "
+                                       "times in backing store: "
+                                       "{name='%s', domain='%s', path='%s'}",
+                                       (*it)->Name().c_str(),
+                                       (*it)->Domain().c_str(),
+                                       (*it)->Path().c_str());
       // We've been given ownership of the cookie and are throwing it
       // away; reclaim the space.
       delete (*it);
@@ -359,13 +360,14 @@ int CookieMonster::TrimDuplicateCookiesForKey(
     // is the most recent one, so we will keep it. The rest are duplicates.
     dupes.erase(dupes.begin());
 
-    LOG(ERROR) << StringPrintf("Found %d duplicate cookies for host='%s', "
-                               "with {name='%s', domain='%s', path='%s'}",
-                               static_cast<int>(dupes.size()),
-                               key.c_str(),
-                               signature.name.c_str(),
-                               signature.domain.c_str(),
-                               signature.path.c_str());
+    LOG(ERROR) << base::StringPrintf(
+        "Found %d duplicate cookies for host='%s', "
+        "with {name='%s', domain='%s', path='%s'}",
+        static_cast<int>(dupes.size()),
+        key.c_str(),
+        signature.name.c_str(),
+        signature.domain.c_str(),
+        signature.path.c_str());
 
     // Remove all the cookies identified by |dupes|. It is valid to delete our
     // list of iterators one at a time, since |cookies_| is a multimap (they
@@ -1883,11 +1885,12 @@ bool CookieMonster::CanonicalCookie::IsDomainMatch(
 }
 
 std::string CookieMonster::CanonicalCookie::DebugString() const {
-  return StringPrintf("name: %s value: %s domain: %s path: %s creation: %"
-                      PRId64,
-                      name_.c_str(), value_.c_str(),
-                      domain_.c_str(), path_.c_str(),
-                      static_cast<int64>(creation_date_.ToTimeT()));
+  return base::StringPrintf(
+      "name: %s value: %s domain: %s path: %s creation: %"
+      PRId64,
+      name_.c_str(), value_.c_str(),
+      domain_.c_str(), path_.c_str(),
+      static_cast<int64>(creation_date_.ToTimeT()));
 }
 
 }  // namespace

net/base/cookie_monster_perftest.cc

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/base/cookie_monster.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/cookie_monster.h"
 #include "net/base/cookie_monster_store_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -46,7 +47,7 @@ TEST(CookieMonsterTest, TestAddCookiesOnSingleHost) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   std::vector<std::string> cookies;
   for (int i = 0; i < kNumCookies; i++) {
-    cookies.push_back(StringPrintf("a%03d=b", i));
+    cookies.push_back(base::StringPrintf("a%03d=b", i));
   }
 
   // Add a bunch of cookies on a single host
@@ -74,7 +75,7 @@ TEST(CookieMonsterTest, TestAddCookieOnManyHosts) {
   std::string cookie(kCookieLine);
   std::vector<GURL> gurls;  // just wanna have ffffuunnn
   for (int i = 0; i < kNumCookies; ++i) {
-    gurls.push_back(GURL(StringPrintf("http://a%04d.izzle", i)));
+    gurls.push_back(GURL(base::StringPrintf("http://a%04d.izzle", i)));
   }
 
   // Add a cookie on a bunch of host
@@ -136,8 +137,8 @@ TEST(CookieMonsterTest, TestDomainTree) {
   for (std::vector<std::string>::const_iterator it = domain_list.begin();
        it != domain_list.end(); it++) {
     GURL gurl("https://" + *it + "/");
-    const std::string cookie = StringPrintf(domain_cookie_format_tree,
-                                            it->c_str());
+    const std::string cookie = base::StringPrintf(domain_cookie_format_tree,
+                                                  it->c_str());
     EXPECT_TRUE(cm->SetCookie(gurl, cookie));
   }
   EXPECT_EQ(31u, cm->GetAllCookies().size());
@@ -178,8 +179,8 @@ TEST(CookieMonsterTest, TestDomainLine) {
     for (std::vector<std::string>::const_iterator it = domain_list.begin();
          it != domain_list.end(); it++) {
       GURL gurl("https://" + *it + "/");
-      const std::string cookie = StringPrintf(domain_cookie_format_line,
-                                              i, it->c_str());
+      const std::string cookie = base::StringPrintf(domain_cookie_format_line,
+                                                    i, it->c_str());
       EXPECT_TRUE(cm->SetCookie(gurl, cookie));
     }
   }
@@ -203,10 +204,11 @@ TEST(CookieMonsterTest, TestImport) {
   int64 time_tick(base::Time::Now().ToInternalValue());
 
   for (int domain_num = 0; domain_num < 300; domain_num++) {
-    std::string domain_name(StringPrintf(".Domain_%d.com", domain_num));
+    std::string domain_name(base::StringPrintf(".Domain_%d.com", domain_num));
     std::string gurl("www" + domain_name);
     for (int cookie_num = 0; cookie_num < 50; cookie_num++) {
-      std::string cookie_line(StringPrintf("Cookie_%d=1; Path=/", cookie_num));
+      std::string cookie_line(base::StringPrintf("Cookie_%d=1; Path=/",
+                                                 cookie_num));
       AddCookieToList(gurl, cookie_line,
                       base::Time::FromInternalValue(time_tick++),
                       &initial_cookies);

net/base/cookie_monster_unittest.cc

@@ -11,6 +11,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_monster.h"
@@ -1042,7 +1043,7 @@ static void TestHostGarbageCollectHelper(int domain_max_cookies,
     scoped_refptr<net::CookieMonster> cm(new net::CookieMonster(NULL, NULL));
     cm->SetKeyScheme(new_key_scheme);
     for (int i = 0; i < more_than_enough_cookies; ++i) {
-      std::string cookie = StringPrintf("a%03d=b", i);
+      std::string cookie = base::StringPrintf("a%03d=b", i);
       EXPECT_TRUE(cm->SetCookie(url_google, cookie));
       std::string cookies = cm->GetCookies(url_google);
       // Make sure we find it in the cookies.
@@ -1063,9 +1064,9 @@ static void TestHostGarbageCollectHelper(int domain_max_cookies,
     scoped_refptr<net::CookieMonster> cm(new net::CookieMonster(NULL, NULL));
     cm->SetKeyScheme(new_key_scheme);
     for (int i = 0; i < more_than_enough_cookies; ++i) {
-      std::string cookie_general = StringPrintf("a%03d=b", i);
+      std::string cookie_general = base::StringPrintf("a%03d=b", i);
       EXPECT_TRUE(cm->SetCookie(url_google, cookie_general));
-      std::string cookie_specific = StringPrintf("c%03d=b", i);
+      std::string cookie_specific = base::StringPrintf("c%03d=b", i);
       EXPECT_TRUE(cm->SetCookie(url_google_specific, cookie_specific));
       std::string cookies_general = cm->GetCookies(url_google);
       EXPECT_NE(cookies_general.find(cookie_general), std::string::npos);
@@ -1117,7 +1118,7 @@ TEST(CookieMonsterTest, TestTotalGarbageCollection) {
   // Add a bunch of cookies on a bunch of host, some should get purged.
   const GURL sticky_cookie("http://a0000.izzle");
   for (int i = 0; i < 4000; ++i) {
-    GURL url(StringPrintf("http://a%04d.izzle", i));
+    GURL url(base::StringPrintf("http://a%04d.izzle", i));
     EXPECT_TRUE(cm->SetCookie(url, "a=b"));
     EXPECT_EQ("a=b", cm->GetCookies(url));
 
@@ -1132,7 +1133,7 @@ TEST(CookieMonsterTest, TestTotalGarbageCollection) {
 
   // Check that cookies that still exist.
   for (int i = 0; i < 4000; ++i) {
-    GURL url(StringPrintf("http://a%04d.izzle", i));
+    GURL url(base::StringPrintf("http://a%04d.izzle", i));
     if ((i == 0) || (i > 1001)) {
       // Cookies should still be around.
       EXPECT_FALSE(cm->GetCookies(url).empty());

net/base/escape_unittest.cc

@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -95,7 +96,7 @@ TEST(EscapeTest, EscapeTextForFormSubmission) {
       EXPECT_EQ(out, std::string("+"));
     } else if (no_escape.find(in) == std::string::npos) {
       // Check %hex escaping
-      std::string expected = StringPrintf("%%%02X", i);
+      std::string expected = base::StringPrintf("%%%02X", i);
       EXPECT_EQ(expected, out);
     } else {
       // No change for things in the no_escape list.

net/base/host_cache_unittest.cc

@@ -7,6 +7,7 @@
 #include "base/format_macros.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -178,22 +179,22 @@ TEST(HostCacheTest, Compact) {
 
   // Add five valid entries at t=10.
   for (int i = 0; i < 5; ++i) {
-    std::string hostname = StringPrintf("valid%d", i);
+    std::string hostname = base::StringPrintf("valid%d", i);
     cache.Set(Key(hostname), OK, AddressList(), now);
   }
   EXPECT_EQ(5U, cache.size());
 
   // Add 3 expired entries at t=0.
   for (int i = 0; i < 3; ++i) {
-    std::string hostname = StringPrintf("expired%d", i);
+    std::string hostname = base::StringPrintf("expired%d", i);
     base::TimeTicks t = now - base::TimeDelta::FromSeconds(10);
     cache.Set(Key(hostname), OK, AddressList(), t);
   }
   EXPECT_EQ(8U, cache.size());
 
   // Add 2 negative entries at t=10
   for (int i = 0; i < 2; ++i) {
-    std::string hostname = StringPrintf("negative%d", i);
+    std::string hostname = base::StringPrintf("negative%d", i);
     cache.Set(Key(hostname), ERR_NAME_NOT_RESOLVED, AddressList(), now);
   }
   EXPECT_EQ(10U, cache.size());
@@ -452,7 +453,7 @@ TEST(HostCacheTest, KeyComparators) {
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]", i));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]", i));
 
     const HostCache::Key& key1 = tests[i].key1;
     const HostCache::Key& key2 = tests[i].key2;

net/base/host_port_pair.cc

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 #include "net/base/host_port_pair.h"
+
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
 
 namespace net {
@@ -18,14 +20,14 @@ HostPortPair HostPortPair::FromURL(const GURL& url) {
 }
 
 std::string HostPortPair::ToString() const {
-  return StringPrintf("%s:%u", HostForURL().c_str(), port_);
+  return base::StringPrintf("%s:%u", HostForURL().c_str(), port_);
 }
 
 std::string HostPortPair::HostForURL() const {
   // Check to see if the host is an IPv6 address.  If so, added brackets.
   if (host_.find(':') != std::string::npos) {
     DCHECK_NE(host_[0], '[');
-    return StringPrintf("[%s]", host_.c_str());
+    return base::StringPrintf("[%s]", host_.c_str());
   }
 
   return host_;

net/base/host_resolver_impl_unittest.cc

@@ -10,6 +10,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/mock_host_resolver.h"
@@ -137,7 +138,7 @@ class EchoingHostResolverProc : public HostResolverProc {
                       AddressList* addrlist,
                       int* os_error) {
     // Encode the request's hostname and address_family in the output address.
-    std::string ip_literal = StringPrintf("192.%d.%d.%d",
+    std::string ip_literal = base::StringPrintf("192.%d.%d.%d",
         static_cast<int>(hostname.size()),
         static_cast<int>(hostname[0]),
         static_cast<int>(address_family));

net/base/net_util.cc

@@ -50,15 +50,16 @@
 #include "base/string_split.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_offset_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "grit/net_resources.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_canon_ip.h"
 #include "googleurl/src/url_parse.h"
+#include "grit/net_resources.h"
 #include "net/base/dns_util.h"
 #include "net/base/escape.h"
 #include "net/base/net_module.h"
@@ -1509,14 +1510,15 @@ bool ParseHostAndPort(const std::string& host_and_port,
 std::string GetHostAndPort(const GURL& url) {
   // For IPv6 literals, GURL::host() already includes the brackets so it is
   // safe to just append a colon.
-  return StringPrintf("%s:%d", url.host().c_str(), url.EffectiveIntPort());
+  return base::StringPrintf("%s:%d", url.host().c_str(),
+                            url.EffectiveIntPort());
 }
 
 std::string GetHostAndOptionalPort(const GURL& url) {
   // For IPv6 literals, GURL::host() already includes the brackets
   // so it is safe to just append a colon.
   if (url.has_port())
-    return StringPrintf("%s:%s", url.host().c_str(), url.port().c_str());
+    return base::StringPrintf("%s:%s", url.host().c_str(), url.port().c_str());
   return url.host();
 }
 
@@ -1547,10 +1549,10 @@ std::string NetAddressToStringWithPort(const struct addrinfo* net_address) {
 
   if (ip_address_string.find(':') != std::string::npos) {
     // Surround with square brackets to avoid ambiguity.
-    return StringPrintf("[%s]:%d", ip_address_string.c_str(), port);
+    return base::StringPrintf("[%s]:%d", ip_address_string.c_str(), port);
   }
 
-  return StringPrintf("%s:%d", ip_address_string.c_str(), port);
+  return base::StringPrintf("%s:%d", ip_address_string.c_str(), port);
 }
 
 std::string GetHostName() {

net/base/net_util_unittest.cc

@@ -8,9 +8,10 @@
 #include "base/format_macros.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/sys_addrinfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -616,7 +617,8 @@ TEST(NetUtilTest, GetIdentityFromURL) {
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, tests[i].input_url));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    tests[i].input_url));
     GURL url(tests[i].input_url);
 
     string16 username, password;
@@ -1866,7 +1868,8 @@ TEST(NetUtilTest, SimplifyUrlForRequest) {
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, tests[i].input_url));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    tests[i].input_url));
     GURL input_url(GURL(tests[i].input_url));
     GURL expected_url(GURL(tests[i].expected_simplified_url));
     EXPECT_EQ(expected_url, net::SimplifyUrlForRequest(input_url));
@@ -2037,9 +2040,9 @@ TEST(NetUtilTest, IPNumberMatchesPrefix) {
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s, %s", i,
-                              tests[i].cidr_literal,
-                              tests[i].ip_literal));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s, %s", i,
+                                    tests[i].cidr_literal,
+                                    tests[i].ip_literal));
 
     net::IPAddressNumber ip_number;
     EXPECT_TRUE(net::ParseIPLiteralToNumber(tests[i].ip_literal, &ip_number));

net/base/pem_tokenizer.cc

@@ -6,6 +6,7 @@
 
 #include "base/base64.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 
 namespace {
 
@@ -95,8 +96,8 @@ void PEMTokenizer::Init(
        allowed_block_types.begin(); it != allowed_block_types.end(); ++it) {
     PEMType allowed_type;
     allowed_type.type = *it;
-    allowed_type.header = StringPrintf(kPEMBeginBlock, it->c_str());
-    allowed_type.footer = StringPrintf(kPEMEndBlock, it->c_str());
+    allowed_type.header = base::StringPrintf(kPEMBeginBlock, it->c_str());
+    allowed_type.footer = base::StringPrintf(kPEMEndBlock, it->c_str());
     block_types_.push_back(allowed_type);
   }
 }