summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_server.cc
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-18 21:31:07 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-18 21:31:07 +0000
commitd25fc23b5f78a579d534fb1d51f4e45a767ff2d8 (patch)
tree71a91ce2cea378cf20078b8e2bda1f4dae448c14 /chrome_frame/test/test_server.cc
parentce87e24351c86bc40b32dca51fe2ebbabc603b1a (diff)
downloadchromium_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 'chrome_frame/test/test_server.cc')
-rw-r--r--chrome_frame/test/test_server.cc5
1 files changed, 2 insertions, 3 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;