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/test/automation | |
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/test/automation')
-rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index 8a08b1d..98ba947 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -55,7 +55,7 @@ void UpdateHistoryDates(const base::FilePath& user_data_dir) { ASSERT_TRUE(db.Open(history)); base::Time yesterday = base::Time::Now() - base::TimeDelta::FromDays(1); std::string yesterday_str = base::Int64ToString(yesterday.ToInternalValue()); - std::string query = StringPrintf( + std::string query = base::StringPrintf( "UPDATE segment_usage " "SET time_slot = %s " "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);", @@ -155,8 +155,9 @@ void ProxyLauncher::CloseBrowserAndServer() { // the UI tests in single-process mode. // TODO(jhughes): figure out why this is necessary at all, and fix it AssertAppNotRunning( - StringPrintf("Unable to quit all browser processes. Original PID %d", - process_id_)); + base::StringPrintf( + "Unable to quit all browser processes. Original PID %d", + process_id_)); DisconnectFromRunningBrowser(); } @@ -315,7 +316,7 @@ void ProxyLauncher::AssertAppNotRunning(const std::string& error_message) { final_error_message += " Leftover PIDs: ["; for (ChromeProcessList::const_iterator it = processes.begin(); it != processes.end(); ++it) { - final_error_message += StringPrintf(" %d", *it); + final_error_message += base::StringPrintf(" %d", *it); } final_error_message += " ]"; } |