Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: content/browser/worker_host/test/worker_browsertest.cc

Issue 240843002: Reverse the embedded-shared-worker flag to turn the feature on by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/worker_host/worker_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/worker_host/test/worker_browsertest.cc
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc
index 1f46d6a7764058ecc8c97412de1c19a7a1e2e160..861977c1005eb2b57006c64c795f8ede4e58ed3a 100644
--- a/content/browser/worker_host/test/worker_browsertest.cc
+++ b/content/browser/worker_host/test/worker_browsertest.cc
@@ -148,6 +148,9 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) {
#else
IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
#endif
+ // There is no limitation of SharedWorker if EmbeddedSharedWorker is enabled.
+ if (WorkerService::EmbeddedSharedWorkerEnabled())
+ return;
int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerFrameWhenSeparate;
std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1);
@@ -165,6 +168,9 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) {
// http://crbug.com/36800
IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) {
#endif
+ // There is no limitation of SharedWorker if EmbeddedSharedWorker is enabled.
+ if (WorkerService::EmbeddedSharedWorkerEnabled())
+ return;
if (base::SysInfo::AmountOfPhysicalMemoryMB() < 8192) {
VLOG(0) << "WorkerTest.LimitTotal not running because it needs 8 GB RAM.";
return;
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/worker_host/worker_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698