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 /components | |
| 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 'components')
| -rw-r--r-- | components/policy/core/browser/url_blacklist_manager.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc index 4b4d35e..5d85138 100644 --- a/components/policy/core/browser/url_blacklist_manager.cc +++ b/components/policy/core/browser/url_blacklist_manager.cc @@ -4,10 +4,6 @@ #include "components/policy/core/browser/url_blacklist_manager.h" -#include <stdint.h> - -#include <limits> - #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h" @@ -141,7 +137,7 @@ struct URLBlacklist::FilterComponents { std::string scheme; std::string host; - uint16_t port; + uint16 port; std::string path; std::string query; int number_of_key_value_pairs; @@ -239,7 +235,7 @@ bool URLBlacklist::FilterToComponents(SegmentURLCallback segment_url, std::string* scheme, std::string* host, bool* match_subdomains, - uint16_t* port, + uint16* port, std::string* path, std::string* query) { url::Parsed parsed; @@ -302,7 +298,7 @@ bool URLBlacklist::FilterToComponents(SegmentURLCallback segment_url, &int_port)) { return false; } - if (int_port <= 0 || int_port > std::numeric_limits<uint16_t>::max()) + if (int_port <= 0 || int_port > kuint16max) return false; *port = int_port; } else { @@ -332,7 +328,7 @@ scoped_refptr<URLMatcherConditionSet> URLBlacklist::CreateConditionSet( const std::string& scheme, const std::string& host, bool match_subdomains, - uint16_t port, + uint16 port, const std::string& path, const std::string& query, bool allow) { |