diff options
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, 7 insertions, 3 deletions
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index f2d7de3..cddcd2c 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -9,6 +9,7 @@ #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" @@ -49,8 +50,8 @@ void Request::ParseHeaders(const std::string& headers) { while (it.GetNext()) { if (LowerCaseEqualsASCII(it.name(), "content-length")) { int int_content_length; - base::StringToInt(it.values_begin(), - it.values_end(), + base::StringToInt(base::StringPiece(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 9003109..8610f83 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -16,6 +16,7 @@ #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" @@ -1554,7 +1555,9 @@ int GetXUaCompatibleDirective(const std::string& directive, char delimiter) { } int header_ie_version = 0; - if (!base::StringToInt(filter_begin + 2, filter_end, &header_ie_version) || + if (!base::StringToInt(base::StringPiece(filter_begin + 2, + filter_end), + &header_ie_version) || header_ie_version == 0) { // ensure it's not a sequence of 0's continue; } |