Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / worker_host / test / worker_browsertest.cc

diff --git a/src/content/browser/worker_host/test/worker_browsertest.cc b/src/content/browser/worker_host/test/worker_browsertest.cc
index fd352eb..861977c 100644 (file)
--- a/src/content/browser/worker_host/test/worker_browsertest.cc
+++ b/src/content/browser/worker_host/test/worker_browsertest.cc
@@ -141,13 +141,16 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) {
   NavigateAndWaitForAuth(url);
 }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
 // This test is flaky inside the Linux SUID sandbox.
 // http://crbug.com/130116
 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);
 
@@ -157,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
 }
 
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
 // This test is flaky inside the Linux SUID sandbox: http://crbug.com/130116
 // Also flaky on Mac: http://crbug.com/295193
 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) {
@@ -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;