diff options
author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 22:33:04 +0000 |
---|---|---|
committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 22:33:04 +0000 |
commit | 7d3cbc90c089bb3ba5cb81a5abdc0846d5826def (patch) | |
tree | 8ad0db2d4581c8e935ed1b07c6b4147a5350a204 /chrome_frame | |
parent | bb192b87059a76b89fbc20ad08347c28656e838d (diff) | |
download | chromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.zip chromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.tar.gz chromium_src-7d3cbc90c089bb3ba5cb81a5abdc0846d5826def.tar.bz2 |
[Cleanup] Remove StringPrintf from global namespace
use of StringPrintf now requires prefixing with base:: or a per-scope using directive
TBR'd:
abodenha: chrome/service
brettw: content, third_party, webkit
darin: base, chrome/browser, chrome/renderer
dgarret: courgette
enne: cc
fischmann: media
gbillock: sql
joi: google_apis,components
rsleevi: net, crypto
sky: chrome/test
thestig: printing, chrome/common,
tsepez: ipc
wez: remoting
yfriedman: testing/android
NOTRY=true
R=brettw@chromium.org
TBR=joi@chromium.org, rsleevi@chromium.org, enne@chromium.org, thestig@chromium.org, darin@chromium.org, abodenha@chromium.org, sky@chromium.org, dgarret@chromium.org, tsepez@chromium.org, fishman@chromium.org, wez@chromium.org, gbillock@chromium.org, yfriedman@chromium.org
BUG=
Review URL: https://codereview.chromium.org/12767006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/metrics_service.cc | 13 | ||||
-rw-r--r-- | chrome_frame/test/navigation_test.cc | 2 | ||||
-rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 2 | ||||
-rw-r--r-- | chrome_frame/urlmon_url_request.cc | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index 73c93b2..cc5e38d 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -180,12 +180,13 @@ class ChromeFrameMetricsDataUploader : public BSCBImpl { LPWSTR* additional_headers) { std::string new_headers; new_headers = - StringPrintf("Content-Length: %s\r\n" - "Content-Type: %s\r\n" - "%s\r\n", - base::Int64ToString(upload_data_size_).c_str(), - mime_type_.c_str(), - http_utils::GetDefaultUserAgentHeaderWithCFTag().c_str()); + base::StringPrintf( + "Content-Length: %s\r\n" + "Content-Type: %s\r\n" + "%s\r\n", + base::Int64ToString(upload_data_size_).c_str(), + mime_type_.c_str(), + http_utils::GetDefaultUserAgentHeaderWithCFTag().c_str()); *additional_headers = reinterpret_cast<wchar_t*>( CoTaskMemAlloc((new_headers.size() + 1) * sizeof(wchar_t))); diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index a8f3d40..d59494e 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -881,7 +881,7 @@ class HttpHeaderTest : public MockIEEventSinkTest, public testing::Test { "Connection: close\r\n" "Content-Type: %s\r\n" "X-UA-Compatible: chrome=1\r\n"; - std::string header = StringPrintf(kHeaderFormat, content_type); + std::string header = base::StringPrintf(kHeaderFormat, content_type); std::wstring url = server_mock_.Resolve(relative_url); EXPECT_CALL(server_mock_, Get(_, StrEq(relative_url), _)) .WillRepeatedly(SendFast(header, data)); diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 4f786dc..ecb01a7 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -1018,7 +1018,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) { virtual bool GetCustomHeaders(std::string* headers) const { if (!is_post_) return false; - *headers = StringPrintf( + *headers = base::StringPrintf( "HTTP/1.1 200 OK\r\n" "Content-Disposition: attachment;filename=\"test.txt\"\r\n" "Content-Type: application/text\r\n" diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index c5a0a25..a6251bb 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -1083,7 +1083,7 @@ void UrlmonUrlRequestManager::StartRequestHelper( for (size_t i = 0; i < elements->size(); ++i) { net::UploadElement* element = (*elements)[i]; DCHECK(element->type() == net::UploadElement::TYPE_BYTES); - std::string chunk_length = StringPrintf( + std::string chunk_length = base::StringPrintf( "%X\r\n", static_cast<unsigned int>(element->bytes_length())); std::vector<char> bytes; bytes.insert(bytes.end(), chunk_length.data(), |