summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-01 11:27:07 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-01 19:35:33 +0000
commit6516805e8c69ac65bcb7d52a2a208be97a7d2a50 (patch)
tree0d67ff4a6fa2fe00b7dc5c51895b162599bab1f3 /jingle
parente5bfeba55d3d80aa4f5c8385ede94853789b0a9a (diff)
downloadchromium_src-6516805e8c69ac65bcb7d52a2a208be97a7d2a50.zip
chromium_src-6516805e8c69ac65bcb7d52a2a208be97a7d2a50.tar.gz
chromium_src-6516805e8c69ac65bcb7d52a2a208be97a7d2a50.tar.bz2
Remove kuint16max.
BUG=138542 Committed: https://crrev.com/0d94fda8c494d7a6c27d065d782f42e99d834f46 Cr-Commit-Position: refs/heads/master@{#362431} Review URL: https://codereview.chromium.org/1475803002 Cr-Commit-Position: refs/heads/master@{#362472}
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/communicator/single_login_attempt.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/jingle/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc
index 04c074f..5b24b5d 100644
--- a/jingle/notifier/communicator/single_login_attempt.cc
+++ b/jingle/notifier/communicator/single_login_attempt.cc
@@ -2,11 +2,13 @@
// 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 "base/basictypes.h"
+#include <stdint.h>
+
+#include <limits>
+#include <string>
+
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -73,7 +75,7 @@ net::HostPortPair ParseRedirectText(const std::string& redirect_text) {
if (!base::StringToInt(parts[1], &port)) {
port = kDefaultXmppPort;
}
- if (port <= 0 || port > kuint16max) {
+ if (port <= 0 || port > std::numeric_limits<uint16_t>::max()) {
port = kDefaultXmppPort;
}
redirect_server.set_port(port);