diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 21:31:07 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 21:31:07 +0000 |
| commit | d25fc23b5f78a579d534fb1d51f4e45a767ff2d8 (patch) | |
| tree | 71a91ce2cea378cf20078b8e2bda1f4dae448c14 /net/proxy | |
| parent | ce87e24351c86bc40b32dca51fe2ebbabc603b1a (diff) | |
| download | chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.zip chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.tar.gz chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.tar.bz2 | |
Revert 114944 - Standardize StringToInt{,64} interface.
Revert due to compile breakage on ChromeOS.
These changes address issue #106655. All variants of StringToInt have been
converted to use the StringPiece class. One instance of conversion, in
chrome/browser/history/text_database.cc, required copying an underlying
string. This is because the string type in question could use 8 or 16
bit characters depending on the OS type, and because StringPiece is not
implemented as a template, the code cannot specify whether to create a
StringPiece or StringPiece16. This should be remedied in a future CL.
R=erikwright@chromium.org
BUG=106655
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=114929
Review URL: http://codereview.chromium.org/8921006
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/8990002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_bypass_rules.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index 1c0fd61..3d622a8 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -7,7 +7,6 @@ #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "net/base/net_util.h" @@ -316,9 +315,7 @@ bool ProxyBypassRules::AddRuleFromStringInternal( host = raw; port = -1; if (pos_colon != std::string::npos) { - if (!base::StringToInt(base::StringPiece(raw.begin() + pos_colon + 1, - raw.end()), - &port) || + if (!base::StringToInt(raw.begin() + pos_colon + 1, raw.end(), &port) || (port < 0 || port > 0xFFFF)) { return false; // Port was invalid. } |