diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 21:59:52 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 21:59:52 +0000 |
| commit | 9e0bfe7d419774de2f4deee72018dd69121b475c (patch) | |
| tree | 9b20bf1c3f3238ec9a9b40c1277fb989d198f5aa /chrome_frame | |
| parent | 31d5661563a8dafc0409cf677a4e149c08ddb770 (diff) | |
| download | chromium_src-9e0bfe7d419774de2f4deee72018dd69121b475c.zip chromium_src-9e0bfe7d419774de2f4deee72018dd69121b475c.tar.gz chromium_src-9e0bfe7d419774de2f4deee72018dd69121b475c.tar.bz2 | |
Revert 114929 - Standardize StringToInt{,64} interface.
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=
Review URL: http://codereview.chromium.org/8921006
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/8984007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_server.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index cddcd2c..f2d7de3 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -50,8 +49,8 @@ void Request::ParseHeaders(const std::string& headers) { while (it.GetNext()) { if (LowerCaseEqualsASCII(it.name(), "content-length")) { int int_content_length; - base::StringToInt(base::StringPiece(it.values_begin(), - it.values_end()), + base::StringToInt(it.values_begin(), + it.values_end(), &int_content_length); content_length_ = int_content_length; break; diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 8610f83..9003109 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -1555,9 +1554,7 @@ int GetXUaCompatibleDirective(const std::string& directive, char delimiter) { } int header_ie_version = 0; - if (!base::StringToInt(base::StringPiece(filter_begin + 2, - filter_end), - &header_ie_version) || + if (!base::StringToInt(filter_begin + 2, filter_end, &header_ie_version) || header_ie_version == 0) { // ensure it's not a sequence of 0's continue; } |