Use uint16 for port numbers, chrome/ edition

chrome/browser/extensions/app_background_page_apitest.cc

 // Copyright (c) 2012 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/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
@@ skipping 208 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   // Background mode should not be active until a background page is created.
@@ skipping 12 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  }"
       "}",
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   ASSERT_TRUE(RunExtensionTest("app_background_page/lacks_permission"))
       << message_;
   ASSERT_TRUE(WaitForBackgroundMode(false));
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"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(),
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   // Background mode should not be active now because no background app was
   // loaded.
   ASSERT_TRUE(LoadExtension(app_dir));
@@ skipping 27 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/test.html\""
+      "      \"web_url\": \"http://a.com:%u/test.html\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"],"
       "  \"background\": {"
       "    \"allow_js_access\": false"
       "  }"
       "}",
       embedded_test_server()->port());
 
   base::FilePath app_dir;
@@ skipping 23 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"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"
       "  }"
       "}",
       embedded_test_server()->port(),
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
 
@@ skipping 14 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(RunExtensionTest("app_background_page/two_pages")) << message_;
   UnloadExtension(extension->id());
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, OpenTwoPagesWithManifest) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"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\"]"
       "}",
       embedded_test_server()->port(),
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   const Extension* extension = GetSingleLoadedExtension();
@@ skipping 10 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"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\"]"
       "}",
       embedded_test_server()->port(),
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   ASSERT_TRUE(RunExtensionTest("app_background_page/bg_open")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_OpenThenClose) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"http://a.com/\""
       "    ],"
       "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
+      "      \"web_url\": \"http://a.com:%u/\""
       "    }"
       "  },"
       "  \"permissions\": [\"background\"]"
       "}",
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   ASSERT_TRUE(LoadExtension(app_dir));
   // There isn't a background page loaded initially.
@@ skipping 25 matching lines @@
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
       "  \"app\": {"
       "    \"urls\": ["
       "      \"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(),
       embedded_test_server()->port());
 
   base::FilePath app_dir;
   ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
   // Background mode should not be active now because no background app was
   // loaded.
   ASSERT_TRUE(LoadExtension(app_dir));
@@ skipping 59 matching lines @@
       extensions::ProcessManager::Get(browser()->profile());
   ImpulseCallbackCounter idle_impulse_counter(manager, extension()->id());
   EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied());
 
   manager->SetKeepaliveImpulseDecrementCallbackForTesting(
       idle_impulse_counter.SetGoalAndGetCallback(1));
   nacl_modules_loaded.Reply("be idle");
   idle_impulse_counter.Wait();
 #endif
 }