diff options
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 3 | ||||
| -rw-r--r-- | chrome_frame/np_proxy_service.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/npapi_url_request.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 8 |
4 files changed, 11 insertions, 10 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index cb36245..bac5005 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -52,6 +52,7 @@ #include "base/file_version_info.h" #include "base/string_util.h" #include "base/thread.h" +#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_version_info.h" #include "chrome/installer/util/browser_distribution.h" @@ -170,7 +171,7 @@ class ChromeFrameMetricsDataUploader : public BSCBImpl { LPWSTR* additional_headers) { std::string new_headers; new_headers = StringPrintf("Content-Length: %s\r\n", - Int64ToString(upload_data_size_).c_str()); + base::Int64ToString(upload_data_size_).c_str()); new_headers += kMetricsType; *additional_headers = reinterpret_cast<wchar_t*>( diff --git a/chrome_frame/np_proxy_service.cc b/chrome_frame/np_proxy_service.cc index 2e648ca..b1eadde 100644 --- a/chrome_frame/np_proxy_service.cc +++ b/chrome_frame/np_proxy_service.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "chrome/common/automation_constants.h" #include "chrome/common/json_value_serializer.h" #include "chrome_frame/np_proxy_service.h" @@ -276,7 +276,7 @@ DictionaryValue* NpProxyService::BuildProxyValueSet() { manual_proxy_settings += "="; manual_proxy_settings += iter->url; manual_proxy_settings += ":"; - manual_proxy_settings += IntToString(iter->port); + manual_proxy_settings += base::IntToString(iter->port); manual_proxy_settings += ";"; } diff --git a/chrome_frame/npapi_url_request.cc b/chrome_frame/npapi_url_request.cc index 7f7faf7..dce5d01 100644 --- a/chrome_frame/npapi_url_request.cc +++ b/chrome_frame/npapi_url_request.cc @@ -4,7 +4,7 @@ #include "chrome_frame/npapi_url_request.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "chrome_frame/np_browser_functions.h" #include "chrome_frame/np_utils.h" #include "net/base/net_errors.h" @@ -74,7 +74,7 @@ bool NPAPIUrlRequest::Start() { // Firefox looks specifically for "Content-length: \d+\r\n\r\n" // to detect if extra headers are added to the message buffer. buffer += "\r\nContent-length: "; - buffer += IntToString(data_len); + buffer += base::IntToString(data_len); buffer += "\r\n\r\n"; } diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index e951f18..da255b5 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -7,10 +7,10 @@ #include <wininet.h> #include <urlmon.h> -#include "base/scoped_ptr.h" -#include "base/string_util.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/scoped_ptr.h" +#include "base/string_number_conversions.h" #include "chrome_frame/bind_context_info.h" #include "chrome_frame/chrome_frame_activex_base.h" #include "chrome_frame/extra_system_apis.h" @@ -450,7 +450,7 @@ STDMETHODIMP UrlmonUrlRequest::GetBindInfo(DWORD* bind_flags, if (get_upload_data(&bind_info->stgmedData.pstm) == S_OK) { bind_info->stgmedData.tymed = TYMED_ISTREAM; DLOG(INFO) << __FUNCTION__ << me() << method() - << " request with " << Int64ToString(post_data_len()) + << " request with " << base::Int64ToString(post_data_len()) << " bytes. url=" << url(); } else { DLOG(INFO) << __FUNCTION__ << me() << "POST request with no data!"; @@ -543,7 +543,7 @@ STDMETHODIMP UrlmonUrlRequest::BeginningTransaction(const wchar_t* url, // Tack on the Content-Length header since when using an IStream type // STGMEDIUM, it looks like it doesn't get set for us :( new_headers = StringPrintf("Content-Length: %s\r\n", - Int64ToString(post_data_len()).c_str()); + base::Int64ToString(post_data_len()).c_str()); } if (!extra_headers().empty()) { |