Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/media/wv_test_license_server_config.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.
 
 #include "chrome/browser/media/wv_test_license_server_config.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
 #include "net/test/python_utils.h"
 
-
-const uint16 kMinPort = 17000;
-const uint16 kPortRangeSize = 1000;
+const uint16_t kMinPort = 17000;
+const uint16_t kPortRangeSize = 1000;
 
 // Widevine license server configuration files.
 const base::FilePath::CharType kKeysFileName[] =
     FILE_PATH_LITERAL("keys.dat");
 const base::FilePath::CharType kPoliciesFileName[] =
     FILE_PATH_LITERAL("policies.dat");
 const base::FilePath::CharType kProfilesFileName[] =
     FILE_PATH_LITERAL("profiles.dat");
 
 // License server configuration files directory name relative to root.
@@ skipping 67 matching lines @@
   command_line->AppendArgPath(config_path.Append(kProfilesFileName));
   command_line->AppendArg(base::StringPrintf("--port=%u", port_));
   return true;
 }
 
 bool WVTestLicenseServerConfig::SelectServerPort() {
   // Try all ports within the range of kMinPort to (kMinPort + kPortRangeSize)
   // Instead of starting from kMinPort, use a random port within that range.
   net::IPAddressNumber address;
   net::ParseIPLiteralToNumber("127.0.0.1", &address);
-  uint16 start_seed = base::RandInt(0, kPortRangeSize);
-  uint16 try_port = 0;
-  for (uint16 i = 0; i < kPortRangeSize; ++i) {
+  uint16_t start_seed = base::RandInt(0, kPortRangeSize);
+  uint16_t try_port = 0;
+  for (uint16_t i = 0; i < kPortRangeSize; ++i) {
     try_port = kMinPort + (start_seed + i) % kPortRangeSize;
     net::NetLog::Source source;
     net::TCPServerSocket sock(NULL, source);
     if (sock.Listen(net::IPEndPoint(address, try_port), 1) == net::OK) {
       port_ = try_port;
       return true;
     }
   }
   DVLOG(0) << "Could not find an open port in the range of " <<  kMinPort <<
              " to " << kMinPort + kPortRangeSize;
@@ skipping 27 matching lines @@
 
 void WVTestLicenseServerConfig::GetLicenseServerRootPath(
     base::FilePath* path) {
   base::FilePath source_root;
   PathService::Get(base::DIR_SOURCE_ROOT, &source_root);
   *path = source_root.Append(FILE_PATH_LITERAL("third_party"))
                      .Append(FILE_PATH_LITERAL("widevine"))
                      .Append(FILE_PATH_LITERAL("test"))
                      .Append(FILE_PATH_LITERAL("license_server"));
 }