diff options
author | avi <avi@chromium.org> | 2015-12-01 09:21:01 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 17:21:56 +0000 |
commit | 911c3c05c6eb35562f354b5b4ddb57528141357f (patch) | |
tree | f96a6ac1adc64a75b56eff7ba43c6a269ce81d94 /jingle | |
parent | 1d9641452a852078f8bee59d24467c10541ffca4 (diff) | |
download | chromium_src-911c3c05c6eb35562f354b5b4ddb57528141357f.zip chromium_src-911c3c05c6eb35562f354b5b4ddb57528141357f.tar.gz chromium_src-911c3c05c6eb35562f354b5b4ddb57528141357f.tar.bz2 |
Revert of Remove kuint16max. (patchset #7 id:120001 of https://codereview.chromium.org/1475803002/ )
Reason for revert:
missed one :(
Original issue's description:
> Remove kuint16max.
>
> BUG=138542
>
> Committed: https://crrev.com/0d94fda8c494d7a6c27d065d782f42e99d834f46
> Cr-Commit-Position: refs/heads/master@{#362431}
TBR=treib@chromium.org,mark@chromium.org,sergeyu@chromium.org,bartfab@chromium.org,rsleevi@chromium.org,sky@chromium.org,cpu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=138542
Review URL: https://codereview.chromium.org/1485853003
Cr-Commit-Position: refs/heads/master@{#362444}
Diffstat (limited to 'jingle')
-rw-r--r-- | jingle/notifier/communicator/single_login_attempt.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/jingle/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc index 5b24b5d..04c074f 100644 --- a/jingle/notifier/communicator/single_login_attempt.cc +++ b/jingle/notifier/communicator/single_login_attempt.cc @@ -2,13 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "jingle/notifier/communicator/single_login_attempt.h" - -#include <stdint.h> - -#include <limits> #include <string> +#include "jingle/notifier/communicator/single_login_attempt.h" + +#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -75,7 +73,7 @@ net::HostPortPair ParseRedirectText(const std::string& redirect_text) { 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); |