Add compiler-specific "examine printf format" attributes to printfs.

net/base/net_util_unittest.cc

 // Copyright (c) 2009 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.
 
-#include "base/basictypes.h"
-#include "base/file_path.h"
-#include "base/string_util.h"
-#include "base/sys_string_conversions.h"
-#include "base/time.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/escape.h"
 #include "net/base/net_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #else
 #include <netdb.h>
 #endif
 
+#include "base/file_path.h"
+#include "base/format_macros.h"
+#include "base/string_util.h"
+#include "base/sys_string_conversions.h"
+#include "base/time.h"
+#include "googleurl/src/gurl.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
 namespace {
 
 class NetUtilTest : public testing::Test {
 };
 
 struct FileCase {
   const wchar_t* file;
   const char* url;
 };
 
@@ skipping 541 matching lines @@
       L"use+rname",
       L"password",
     },
     { // Use a '&' in the password.
       "http://username:p&ssword@google.com",
       L"username",
       L"p&ssword",
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%d]: %s", i, tests[i].input_url));
+    SCOPED_TRACE(StringPrintf("Test[%" PRIuS "]: %s", i, tests[i].input_url));
     GURL url(tests[i].input_url);
 
     std::wstring username, password;
     net::GetIdentityFromURL(url, &username, &password);
 
     EXPECT_EQ(tests[i].expected_username, username);
     EXPECT_EQ(tests[i].expected_password, password);
   }
 }
 
@@ skipping 987 matching lines @@
     { // Try an FTP URL -- strip both the reference and the username/password.
       "ftp://user:pass@google.com:80/sup?yo#X#X",
       "ftp://google.com:80/sup?yo",
     },
     { // Try an standard URL with unknow scheme.
       "foobar://user:pass@google.com:80/sup?yo#X#X",
       "foobar://google.com:80/sup?yo",
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    SCOPED_TRACE(StringPrintf("Test[%d]: %s", i, tests[i].input_url));
+    SCOPED_TRACE(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));
   }
 }
 
 TEST(NetUtilTest, SetExplicitlyAllowedPortsTest) {
   std::wstring invalid[] = { L"1,2,a", L"'1','2'", L"1, 2, 3", L"1 0,11,12" };
   std::wstring valid[] = { L"", L"1", L"1,2", L"1,2,3", L"10,11,12,13" };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(invalid); ++i) {
     net::SetExplicitlyAllowedPorts(invalid[i]);
     EXPECT_EQ(0, static_cast<int>(net::explicitly_allowed_ports.size()));
   }
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(valid); ++i) {
     net::SetExplicitlyAllowedPorts(valid[i]);
     EXPECT_EQ(i, net::explicitly_allowed_ports.size());
   }
 }