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 /content/browser/worker_host | |
| 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 'content/browser/worker_host')
| -rw-r--r-- | content/browser/worker_host/test/worker_browsertest.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 0c335b6..6ef70b6 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -351,7 +351,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) { IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) { #endif int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; - std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1); + std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1); GURL url = GetTestURL("many_shared_workers.html", query); NavigateToURL(shell(), url); @@ -374,15 +374,17 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate; - std::string query = StringPrintf("?count=%d", max_workers_per_tab); + std::string query = base::StringPrintf("?count=%d", max_workers_per_tab); GURL url = GetTestURL("many_shared_workers.html", query); - NavigateToURL(shell(), GURL(url.spec() + StringPrintf("&client_id=0"))); + NavigateToURL(shell(), + GURL(url.spec() + base::StringPrintf("&client_id=0"))); // Adding 1 so that we cause some workers to be queued. int tab_count = (total_workers / max_workers_per_tab) + 1; for (int i = 1; i < tab_count; ++i) { NavigateToURL( - CreateBrowser(), GURL(url.spec() + StringPrintf("&client_id=%d", i))); + CreateBrowser(), + GURL(url.spec() + base::StringPrintf("&client_id=%d", i))); } // Check that we didn't create more than the max number of workers. @@ -406,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { // Tests to make sure that queued shared workers are started up when shared // workers shut down. int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; - std::string query = StringPrintf("?count=%d", max_workers_per_tab); + std::string query = base::StringPrintf("?count=%d", max_workers_per_tab); RunTest("queued_shared_worker_shutdown.html", query); ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab)); } @@ -418,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) { // Tests to make sure that only one instance of queued shared workers are // started up even when those instances are on multiple tabs. int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; - std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1); + std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1); GURL url = GetTestURL("many_shared_workers.html", query); NavigateToURL(shell(), url); ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab)); @@ -441,7 +443,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTa // Tests to make sure that queued shared workers are started up when // an instance is launched from another tab. int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; - std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1); + std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1); GURL url = GetTestURL("many_shared_workers.html", query); NavigateToURL(shell(), url); ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab)); @@ -449,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTa // First window has hit its limit. Now launch second window which creates // the same worker that was queued in the first window, to ensure it gets // connected to the first window too. - query = StringPrintf("?id=%d", max_workers_per_tab); + query = base::StringPrintf("?id=%d", max_workers_per_tab); url = GetTestURL("single_shared_worker.html", query); NavigateToURL(CreateBrowser(), url); |