Use uint16 for port numbers more pervasively.

chrome/browser/net/sdch_browsertest.cc

 // Copyright 2014 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.
 
 // End-to-end SDCH tests.  Uses the embedded test server to return SDCH
 // results
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 303 matching lines @@
 
   // Get the data from the server.  Return value is success/failure of the
   // data operation, |*sdch_encoding_used| indicates whether or not the
   // data was retrieved with sdch encoding.
   // This is done through FetchUrl(), so the various helper functions
   // will have valid status if it returns successfully.
   bool GetDataDetailed(net::URLRequestContextGetter* getter,
                        bool* sdch_encoding_used) {
     FetchUrlDetailed(
         GURL(base::StringPrintf(
-            "http://%s:%d%s", kTestHost, test_server_port(), kDataURLPath)),
+            "http://%s:%u%s", kTestHost, test_server_port(), kDataURLPath)),
         getter);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, FetcherStatus().status())
         << "Error code is " << FetcherStatus().error();
     EXPECT_EQ(200, FetcherResponseCode());
     EXPECT_EQ(kSampleData, FetcherResponseContents());
 
     if (net::URLRequestStatus::SUCCESS != FetcherStatus().status() ||
         200 != FetcherResponseCode()) {
       *sdch_encoding_used = false;
       return false;
@@ skipping 113 matching lines @@
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&SdchResponseHandler::WaitAndGetRequestVector,
                    base::Unretained(&response_handler_),
                    num_requests,
                    run_loop.QuitClosure(),
                    result));
     run_loop.Run();
   }
 
-  int test_server_port() { return test_server_.port(); }
+  uint16 test_server_port() { return test_server_.port(); }
 
   void SetSdchCacheability(bool cache_sdch_response) {
     base::RunLoop run_loop;
     content::BrowserThread::PostTaskAndReply(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&SdchResponseHandler::set_cache_sdch_response,
                    base::Unretained(&response_handler_),
                    cache_sdch_response),
         run_loop.QuitClosure());
     run_loop.Run();
@@ skipping 221 matching lines @@
   ASSERT_TRUE(SetupIncognitoBrowser());
   ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser()));
 
   // Data fetches on main browser should not be SDCH encoded.
   bool sdch_encoding_used = true;
   ASSERT_TRUE(GetData(&sdch_encoding_used));
   EXPECT_FALSE(sdch_encoding_used);
 }
 
 }  // namespace