diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 14:39:42 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 14:39:42 +0000 |
| commit | c9c07779224d9dd320323943a569dbf2e416a411 (patch) | |
| tree | a040e1ca03410c7cb37547b16b5a0fb8bea67dde /chrome_frame/test | |
| parent | be1ce6a7b2fa7e9622e5b249abd5fab478b6ca05 (diff) | |
| download | chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.zip chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.tar.gz chromium_src-c9c07779224d9dd320323943a569dbf2e416a411.tar.bz2 | |
Remove number conversion functions from string_util. These moved to string_number_conversions.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3054036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/mock_ie_event_sink_test.h | 3 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.cc | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index e751073..73e8778 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/chrome_frame/test/mock_ie_event_sink_test.h @@ -9,6 +9,7 @@ #include <atlcom.h> #include <string> +#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/ie_event_sink.h" @@ -213,7 +214,7 @@ class MockIEEventSinkTest { DCHECK_LT(index, 5); std::wstring base_name = L"anchor.html"; if (index > 0) - base_name += std::wstring(L"#a") + IntToWString(index); + base_name += std::wstring(L"#a") + base::IntToString16(index); return GetTestUrl(base_name); } diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 8f0910d..623a044 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -4,6 +4,7 @@ #include "base/logging.h" #include "base/registry.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -44,8 +45,10 @@ void Request::ParseHeaders(const std::string& headers) { "\r\n"); while (it.GetNext()) { if (LowerCaseEqualsASCII(it.name(), "content-length")) { - content_length_ = StringToInt(it.values().c_str()); - break; + int int_content_length; + base::StringToInt(it.values().c_str(), &int_content_length); + content_length_ = int_content_length; + break; } } } @@ -362,4 +365,4 @@ void ConfigurableConnection::SendWithOptions(const std::string& headers, options.timeout_); } -} // namespace test_server
\ No newline at end of file +} // namespace test_server |