Use uint16 for port numbers more pervasively.

chrome/browser/extensions/app_background_page_apitest.cc

Index: chrome/browser/extensions/app_background_page_apitest.cc
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index 2059f81394ad7e1c3561122d7e0e954e133e6614..c0bbe0779320c2d6bcae882b1d9d7961d7adccb0 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -226,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, MAYBE_Basic) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
@@ -259,7 +259,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_LacksPermission) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  }"
       "}",
@@ -287,12 +287,12 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
-      "    \"page\": \"http://a.com:%d/test.html\""
+      "    \"page\": \"http://a.com:%u/test.html\""
       "  }"
       "}",
       embedded_test_server()->port(),
@@ -340,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/test.html\""
+      "      \"web_url\": \"http://a.com:%u/test.html\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
@@ -384,12 +384,12 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsManifestBackgroundPage) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
-      "    \"page\": \"http://a.com:%d/bg.html\","
+      "    \"page\": \"http://a.com:%u/bg.html\","
       "    \"allow_js_access\": false"
       "  }"
       "}",
@@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, OpenTwoBackgroundPages) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
@@ -453,11 +453,11 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, OpenTwoPagesWithManifest) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"background\": {"
-      "    \"page\": \"http://a.com:%d/bg.html\""
+      "    \"page\": \"http://a.com:%u/bg.html\""
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
@@ -488,10 +488,10 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_OpenPopupFromBGPage) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
-      "  \"background\": { \"page\": \"http://a.com:%d/extensions/api_test/"
+      "  \"background\": { \"page\": \"http://a.com:%u/extensions/api_test/"
       "app_background_page/bg_open/bg_open_bg.html\" },"
       "  \"permissions\": [\"background\"]"
       "}",
@@ -518,7 +518,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_OpenThenClose) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
@@ -564,12 +564,12 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, UnloadExtensionWhileHidden) {
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
-      "    \"page\": \"http://a.com:%d/test.html\""
+      "    \"page\": \"http://a.com:%u/test.html\""
       "  }"
       "}",
       embedded_test_server()->port(),