Revert of Remove kuint16max.

net/dns/dns_session.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 "net/dns/dns_session.h"
 
-#include <stdint.h>
-
-#include <limits>
-
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sample_vector.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/dns/dns_config_service.h"
@@ skipping 61 matching lines @@
 DnsSession::SocketLease::~SocketLease() {
   session_->FreeSocket(server_index_, socket_.Pass());
 }
 
 DnsSession::DnsSession(const DnsConfig& config,
                        scoped_ptr<DnsSocketPool> socket_pool,
                        const RandIntCallback& rand_int_callback,
                        NetLog* net_log)
     : config_(config),
       socket_pool_(socket_pool.Pass()),
-      rand_callback_(base::Bind(rand_int_callback,
-                                0,
-                                std::numeric_limits<uint16_t>::max())),
+      rand_callback_(base::Bind(rand_int_callback, 0, kuint16max)),
       net_log_(net_log),
       server_index_(0) {
   socket_pool_->Initialize(&config_.nameservers, net_log);
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "AsyncDNS.ServerCount", config_.nameservers.size(), 0, 10, 11);
   for (size_t i = 0; i < config_.nameservers.size(); ++i) {
     server_stats_.push_back(make_scoped_ptr(
         new ServerStats(config_.timeout, rtt_buckets_.Pointer())));
   }
 }
 
 DnsSession::~DnsSession() {
   RecordServerStats();
 }
 
-uint16_t DnsSession::NextQueryId() const {
-  return static_cast<uint16_t>(rand_callback_.Run());
+uint16 DnsSession::NextQueryId() const {
+  return static_cast<uint16>(rand_callback_.Run());
 }
 
 unsigned DnsSession::NextFirstServerIndex() {
   unsigned index = NextGoodServerIndex(server_index_);
   if (config_.rotate)
     server_index_ = (server_index_ + 1) % config_.nameservers.size();
   return index;
 }
 
 unsigned DnsSession::NextGoodServerIndex(unsigned server_index) {
@@ skipping 176 matching lines @@
   timeout = std::max(timeout, base::TimeDelta::FromMilliseconds(kMinTimeoutMs));
 
   // The timeout still doubles every full round.
   unsigned num_backoffs = attempt / config_.nameservers.size();
 
   return std::min(timeout * (1 << num_backoffs),
                   base::TimeDelta::FromMilliseconds(kMaxTimeoutMs));
 }
 
 }  // namespace net