Use uint16 for port numbers more pervasively.

chrome/browser/extensions/activity_log/activity_log_browsertest.cc

 // Copyright (c) 2013 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/strings/stringprintf.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 20 matching lines @@
   // Make sure the activity log is turned on.
   void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogging);
     command_line->AppendSwitchASCII(switches::kPrerenderMode,
                                     switches::kPrerenderModeSwitchValueEnabled);
   }
 
   static void Prerender_Arguments(
       const std::string& extension_id,
-      int port,
+      uint16 port,
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     // This is to exit RunLoop (base::MessageLoop::current()->Run()) below
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::MessageLoop::QuitClosure());
 
     ASSERT_TRUE(i->size());
     scoped_refptr<Action> last = i->front();
 
     ASSERT_EQ(extension_id, last->extension_id());
     ASSERT_EQ(Action::ACTION_CONTENT_SCRIPT, last->action_type());
     ASSERT_EQ("[\"/google_cs.js\"]",
               ActivityLogPolicy::Util::Serialize(last->args()));
     ASSERT_EQ(
-        base::StringPrintf("http://www.google.com.bo:%d/test.html", port),
+        base::StringPrintf("http://www.google.com.bo:%u/test.html", port),
         last->SerializePageUrl());
     ASSERT_EQ(
-        base::StringPrintf("www.google.com.bo:%d/test.html", port),
+        base::StringPrintf("www.google.com.bo:%u/test.html", port),
         last->page_title());
     ASSERT_EQ("{\"prerender\":true}",
               ActivityLogPolicy::Util::Serialize(last->other()));
     ASSERT_EQ("", last->api_name());
     ASSERT_EQ("", last->SerializeArgUrl());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
-  int port = embedded_test_server()->port();
+  uint16 port = embedded_test_server()->port();
 
   // Get the extension (chrome/test/data/extensions/activity_log)
   const Extension* ext =
       LoadExtension(test_data_dir_.AppendASCII("activity_log"));
   ASSERT_TRUE(ext);
 
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
   ASSERT_TRUE(activity_log);
 
   //Disable rate limiting in PrerenderManager
@@ skipping 11 matching lines @@
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
 
   content::WindowedNotificationObserver page_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
 
   GURL url(base::StringPrintf(
-      "http://www.google.com.bo:%d/test.html",
+      "http://www.google.com.bo:%u/test.html",
       port));
 
   if (!prerender_manager->cookie_store_loaded()) {
     base::RunLoop loop;
     prerender_manager->set_on_cookie_store_loaded_cb_for_testing(
         loop.QuitClosure());
     loop.Run();
   }
 
   const gfx::Size kSize(640, 480);
@@ skipping 13 matching lines @@
       "",
       -1,
       base::Bind(
           ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port));
 
   // Allow invocation of Prerender_Arguments
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace extensions