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

Side by Side Diff: content/browser/worker_host/test/worker_browsertest.cc

Issue 237673002: remove redundant ifdefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 135
136 // Make sure that auth dialog is displayed from shared worker context. 136 // Make sure that auth dialog is displayed from shared worker context.
137 // http://crbug.com/33344 137 // http://crbug.com/33344
138 IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) { 138 IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) {
139 ASSERT_TRUE(test_server()->Start()); 139 ASSERT_TRUE(test_server()->Start());
140 GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html"); 140 GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html");
141 NavigateAndWaitForAuth(url); 141 NavigateAndWaitForAuth(url);
142 } 142 }
143 143
144 #if defined(OS_LINUX) || defined(OS_CHROMEOS) 144 #if defined(OS_LINUX)
145 // This test is flaky inside the Linux SUID sandbox. 145 // This test is flaky inside the Linux SUID sandbox.
146 // http://crbug.com/130116 146 // http://crbug.com/130116
147 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) { 147 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) {
148 #else 148 #else
149 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) { 149 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
150 #endif 150 #endif
151 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerFrameWhenSeparate; 151 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerFrameWhenSeparate;
152 std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1); 152 std::string query = base::StringPrintf("?count=%d", max_workers_per_tab + 1);
153 153
154 GURL url = GetTestURL("many_shared_workers.html", query); 154 GURL url = GetTestURL("many_shared_workers.html", query);
155 NavigateToURL(shell(), url); 155 NavigateToURL(shell(), url);
156 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab)); 156 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
157 } 157 }
158 158
159 159
160 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX) 160 #if defined(OS_LINUX) || defined(OS_MACOSX)
161 // This test is flaky inside the Linux SUID sandbox: http://crbug.com/130116 161 // This test is flaky inside the Linux SUID sandbox: http://crbug.com/130116
162 // Also flaky on Mac: http://crbug.com/295193 162 // Also flaky on Mac: http://crbug.com/295193
163 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) { 163 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) {
164 #else 164 #else
165 // http://crbug.com/36800 165 // http://crbug.com/36800
166 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { 166 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) {
167 #endif 167 #endif
168 if (base::SysInfo::AmountOfPhysicalMemoryMB() < 8192) { 168 if (base::SysInfo::AmountOfPhysicalMemoryMB() < 8192) {
169 VLOG(0) << "WorkerTest.LimitTotal not running because it needs 8 GB RAM."; 169 VLOG(0) << "WorkerTest.LimitTotal not running because it needs 8 GB RAM.";
170 return; 170 return;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 IN_PROC_BROWSER_TEST_F(WorkerTest, PassMessagePortToSharedWorker) { 285 IN_PROC_BROWSER_TEST_F(WorkerTest, PassMessagePortToSharedWorker) {
286 RunTest("pass_messageport_to_sharedworker.html", ""); 286 RunTest("pass_messageport_to_sharedworker.html", "");
287 } 287 }
288 288
289 IN_PROC_BROWSER_TEST_F(WorkerTest, 289 IN_PROC_BROWSER_TEST_F(WorkerTest,
290 PassMessagePortToSharedWorkerDontWaitForConnect) { 290 PassMessagePortToSharedWorkerDontWaitForConnect) {
291 RunTest("pass_messageport_to_sharedworker_dont_wait_for_connect.html", ""); 291 RunTest("pass_messageport_to_sharedworker_dont_wait_for_connect.html", "");
292 } 292 }
293 293
294 } // namespace content 294 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/feedback/feedback_uploader_unittest.cc ('k') | third_party/tcmalloc/chromium/src/system-alloc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698