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

7 files changed, 30 insertions, 19 deletions

diff --git a/net/ftp/ftp_directory_listing_buffer_unittest.cc b/net/ftp/ftp_directory_listing_buffer_unittest.cc
index f07f535..ff7aedf 100644
--- a/net/ftp/ftp_directory_listing_buffer_unittest.cc
+++ b/net/ftp/ftp_directory_listing_buffer_unittest.cc
@@ -61,7 +61,7 @@ TEST(FtpDirectoryListingBufferTest, Parse) {
                                      &mock_current_time));
 
   for (size_t i = 0; i < arraysize(test_files); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, test_files[i]));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, test_files[i]));
 
     net::FtpDirectoryListingBuffer buffer(mock_current_time);
 
@@ -90,7 +90,7 @@ TEST(FtpDirectoryListingBufferTest, Parse) {
       int64 size;
       base::StringToInt64(lines[8 * i + 2], &size);
 
-      SCOPED_TRACE(StringPrintf("Filename: %s", name.c_str()));
+      SCOPED_TRACE(base::StringPrintf("Filename: %s", name.c_str()));
 
       int year, month, day_of_month, hour, minute;
       base::StringToInt(lines[8 * i + 3], &year);
diff --git a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
index c67c928..44c3eb6 100644
--- a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "net/ftp/ftp_directory_listing_parser_ls.h"
 
 namespace {
@@ -77,7 +78,8 @@ TEST_F(FtpDirectoryListingParserLsTest, Good) {
       2006, 7, 17, 0, 0 },
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    good_cases[i].input));
 
     net::FtpDirectoryListingParserLs parser(mock_current_time);
     RunSingleLineTestCase(&parser, good_cases[i]);
diff --git a/net/ftp/ftp_directory_listing_parser_mlsd_unittest.cc b/net/ftp/ftp_directory_listing_parser_mlsd_unittest.cc
index 9663664..1a01f27 100644
--- a/net/ftp/ftp_directory_listing_parser_mlsd_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_mlsd_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "net/ftp/ftp_directory_listing_parser_mlsd.h"
 
 namespace {
@@ -31,7 +32,8 @@ TEST_F(FtpDirectoryListingParserMlsdTest, Good) {
       2001, 4, 14, 15, 52 },
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    good_cases[i].input));
 
     net::FtpDirectoryListingParserMlsd parser;
     RunSingleLineTestCase(&parser, good_cases[i]);
diff --git a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
index 6570846..f5e4a35 100644
--- a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "net/ftp/ftp_directory_listing_parser_netware.h"
 
@@ -27,7 +28,8 @@ TEST_F(FtpDirectoryListingParserNetwareTest, Good) {
       1994, 11, 11, 18, 25 },
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    good_cases[i].input));
 
     net::FtpDirectoryListingParserNetware parser(mock_current_time);
     // The parser requires a "total n" like before accepting regular input.
diff --git a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
index 47cdaa5..ab5366f 100644
--- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/format_macros.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "net/ftp/ftp_directory_listing_parser_vms.h"
 
@@ -45,7 +46,8 @@ TEST_F(FtpDirectoryListingParserVmsTest, Good) {
       2005, 3, 12, 8, 44 },
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    good_cases[i].input));
 
     net::FtpDirectoryListingParserVms parser;
     ASSERT_TRUE(
@@ -101,7 +103,7 @@ TEST_F(FtpDirectoryListingParserVmsTest, Bad) {
     "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RRWWEEDD,RE,RE)",
   };
   for (size_t i = 0; i < arraysize(bad_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
 
     std::vector<std::string> lines;
     SplitString(bad_cases[i], '|', &lines);
diff --git a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
index eaf48ca..c53cfd1 100644
--- a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "net/ftp/ftp_directory_listing_parser_windows.h"
 
 namespace {
@@ -58,7 +59,8 @@ TEST_F(FtpDirectoryListingParserWindowsTest, Good) {
       2010, 12, 25, 12, 0 },
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    good_cases[i].input));
 
     net::FtpDirectoryListingParserWindows parser;
     RunSingleLineTestCase(&parser, good_cases[i]);
diff --git a/net/ftp/ftp_util_unittest.cc b/net/ftp/ftp_util_unittest.cc
index 20450c2..98ae975 100644
--- a/net/ftp/ftp_util_unittest.cc
+++ b/net/ftp/ftp_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,8 +7,9 @@
 #include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/stringprintf.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -140,9 +141,9 @@ TEST(FtpUtilTest, LsDateListingToTime) {
     { "Dec", "06", "21:00", 1993, 12, 6, 21, 0 },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s %s %s", i,
-                              kTestCases[i].month, kTestCases[i].day,
-                              kTestCases[i].rest));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s %s %s", i,
+                                    kTestCases[i].month, kTestCases[i].day,
+                                    kTestCases[i].rest));
 
     base::Time time;
     ASSERT_TRUE(net::FtpUtil::LsDateListingToTime(
@@ -179,8 +180,8 @@ TEST(FtpUtilTest, GetStringPartAfterColumns) {
     { "  foo   abc ", 2, "" },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); i++) {
-    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s %d",
-                              i, kTestCases[i].text, kTestCases[i].column));
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s %d", i,
+                                    kTestCases[i].text, kTestCases[i].column));
 
     EXPECT_EQ(ASCIIToUTF16(kTestCases[i].expected_result),
               net::FtpUtil::GetStringPartAfterColumns(