Revert of Remove kuint16max.

jingle/notifier/communicator/single_login_attempt.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 <string>
+
 #include "jingle/notifier/communicator/single_login_attempt.h"
 
-#include <stdint.h>
-
-#include <limits>
-#include <string>
-
+#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "jingle/notifier/listener/xml_element_util.h"
 #include "net/base/host_port_pair.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/xmppclientsettings.h"
@@ skipping 46 matching lines @@
   }
   redirect_server.set_host(parts[0]);
   if (parts.size() <= 1) {
     return redirect_server;
   }
   // Try to parse the port, falling back to kDefaultXmppPort.
   int port = kDefaultXmppPort;
   if (!base::StringToInt(parts[1], &port)) {
     port = kDefaultXmppPort;
   }
-  if (port <= 0 || port > std::numeric_limits<uint16_t>::max()) {
+  if (port <= 0 || port > kuint16max) {
     port = kDefaultXmppPort;
   }
   redirect_server.set_port(port);
   return redirect_server;
 }
 
 }  // namespace
 
 void SingleLoginAttempt::OnError(buzz::XmppEngine::Error error, int subcode,
                                  const buzz::XmlElement* stream_error) {
@@ skipping 86 matching lines @@
           client_settings.token_service(),
           login_settings_.auth_mechanism());
   xmpp_connection_.reset(
       new XmppConnection(client_settings,
                          login_settings_.request_context_getter(),
                          this,
                          pre_xmpp_auth));
 }
 
 }  // namespace notifier