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

Side by Side Diff: content/browser/plugin_browsertest.cc

Issue 16071003: Disable *all* PluginTest(s) for Win64 build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 LoadAndWait(GetURL("self_delete_plugin_geturl.html")); 140 LoadAndWait(GetURL("self_delete_plugin_geturl.html"));
141 } 141 }
142 142
143 // Tests if a plugin executing a self deleting script using Invoke 143 // Tests if a plugin executing a self deleting script using Invoke
144 // works without crashing or hanging 144 // works without crashing or hanging
145 // Flaky. See http://crbug.com/30702 145 // Flaky. See http://crbug.com/30702
146 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvoke)) { 146 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvoke)) {
147 LoadAndWait(GetURL("self_delete_plugin_invoke.html")); 147 LoadAndWait(GetURL("self_delete_plugin_invoke.html"));
148 } 148 }
149 149
150 IN_PROC_BROWSER_TEST_F(PluginTest, NPObjectReleasedOnDestruction) { 150 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectReleasedOnDestruction)) {
151 NavigateToURL(shell(), GetURL("npobject_released_on_destruction.html")); 151 NavigateToURL(shell(), GetURL("npobject_released_on_destruction.html"));
152 NavigateAway(); 152 NavigateAway();
153 } 153 }
154 154
155 // Test that a dialog is properly created when a plugin throws an 155 // Test that a dialog is properly created when a plugin throws an
156 // exception. Should be run for in and out of process plugins, but 156 // exception. Should be run for in and out of process plugins, but
157 // the more interesting case is out of process, where we must route 157 // the more interesting case is out of process, where we must route
158 // the exception to the correct renderer. 158 // the exception to the correct renderer.
159 IN_PROC_BROWSER_TEST_F(PluginTest, NPObjectSetException) { 159 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectSetException)) {
160 LoadAndWait(GetURL("npobject_set_exception.html")); 160 LoadAndWait(GetURL("npobject_set_exception.html"));
161 } 161 }
162 162
163 #if defined(OS_WIN) 163 #if defined(OS_WIN)
164 // Tests if a plugin executing a self deleting script in the context of 164 // Tests if a plugin executing a self deleting script in the context of
165 // a synchronous mouseup works correctly. 165 // a synchronous mouseup works correctly.
166 // This was never ported to Mac. The only thing remaining is to make 166 // This was never ported to Mac. The only thing remaining is to make
167 // SimulateMouseClick get to Mac plugins, currently it doesn't work. 167 // SimulateMouseClick get to Mac plugins, currently it doesn't work.
168 IN_PROC_BROWSER_TEST_F(PluginTest, 168 IN_PROC_BROWSER_TEST_F(PluginTest,
169 MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) { 169 MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 203 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
204 } 204 }
205 205
206 // Test passing arguments to a plugin. 206 // Test passing arguments to a plugin.
207 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Arguments)) { 207 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Arguments)) {
208 LoadAndWait(GetURL("arguments.html")); 208 LoadAndWait(GetURL("arguments.html"));
209 } 209 }
210 210
211 // Test invoking many plugins within a single page. 211 // Test invoking many plugins within a single page.
212 IN_PROC_BROWSER_TEST_F(PluginTest, ManyPlugins) { 212 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ManyPlugins)) {
213 LoadAndWait(GetURL("many_plugins.html")); 213 LoadAndWait(GetURL("many_plugins.html"));
214 } 214 }
215 215
216 // Test various calls to GetURL from a plugin. 216 // Test various calls to GetURL from a plugin.
217 IN_PROC_BROWSER_TEST_F(PluginTest, GetURL) { 217 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURL)) {
218 LoadAndWait(GetURL("geturl.html")); 218 LoadAndWait(GetURL("geturl.html"));
219 } 219 }
220 220
221 // Test various calls to GetURL for javascript URLs with 221 // Test various calls to GetURL for javascript URLs with
222 // non NULL targets from a plugin. 222 // non NULL targets from a plugin.
223 IN_PROC_BROWSER_TEST_F(PluginTest, GetJavaScriptURL) { 223 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL)) {
224 LoadAndWait(GetURL("get_javascript_url.html")); 224 LoadAndWait(GetURL("get_javascript_url.html"));
225 } 225 }
226 226
227 // Test that calling GetURL with a javascript URL and target=_self 227 // Test that calling GetURL with a javascript URL and target=_self
228 // works properly when the plugin is embedded in a subframe. 228 // works properly when the plugin is embedded in a subframe.
229 IN_PROC_BROWSER_TEST_F(PluginTest, GetJavaScriptURL2) { 229 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) {
230 LoadAndWait(GetURL("get_javascript_url2.html")); 230 LoadAndWait(GetURL("get_javascript_url2.html"));
231 } 231 }
232 232
233 // Test is flaky on linux/cros/win builders. http://crbug.com/71904 233 // Test is flaky on linux/cros/win builders. http://crbug.com/71904
234 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_GetURLRedirectNotification) { 234 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_GetURLRedirectNotification) {
235 LoadAndWait(GetURL("geturl_redirect_notify.html")); 235 LoadAndWait(GetURL("geturl_redirect_notify.html"));
236 } 236 }
237 237
238 // Tests that identity is preserved for NPObjects passed from a plugin 238 // Tests that identity is preserved for NPObjects passed from a plugin
239 // into JavaScript. 239 // into JavaScript.
240 IN_PROC_BROWSER_TEST_F(PluginTest, NPObjectIdentity) { 240 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectIdentity)) {
241 LoadAndWait(GetURL("npobject_identity.html")); 241 LoadAndWait(GetURL("npobject_identity.html"));
242 } 242 }
243 243
244 // Tests that if an NPObject is proxies back to its original process, the 244 // Tests that if an NPObject is proxies back to its original process, the
245 // original pointer is returned and not a proxy. If this fails the plugin 245 // original pointer is returned and not a proxy. If this fails the plugin
246 // will crash. 246 // will crash.
247 IN_PROC_BROWSER_TEST_F(PluginTest, NPObjectProxy) { 247 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectProxy)) {
248 LoadAndWait(GetURL("npobject_proxy.html")); 248 LoadAndWait(GetURL("npobject_proxy.html"));
249 } 249 }
250 250
251 #if defined(OS_WIN) || defined(OS_MACOSX) 251 #if defined(OS_WIN) || defined(OS_MACOSX)
252 // Tests if a plugin executing a self deleting script in the context of 252 // Tests if a plugin executing a self deleting script in the context of
253 // a synchronous paint event works correctly 253 // a synchronous paint event works correctly
254 // http://crbug.com/44960 254 // http://crbug.com/44960
255 IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeInSynchronousPaint) { 255 IN_PROC_BROWSER_TEST_F(PluginTest,
256 MAYBE(SelfDeletePluginInvokeInSynchronousPaint)) {
256 LoadAndWait(GetURL("execute_script_delete_in_paint.html")); 257 LoadAndWait(GetURL("execute_script_delete_in_paint.html"));
257 } 258 }
258 #endif 259 #endif
259 260
260 // Tests that if a plugin executes a self resizing script in the context of a 261 // Tests that if a plugin executes a self resizing script in the context of a
261 // synchronous paint, the plugin doesn't use deallocated memory. 262 // synchronous paint, the plugin doesn't use deallocated memory.
262 // http://crbug.com/139462 263 // http://crbug.com/139462
263 IN_PROC_BROWSER_TEST_F(PluginTest, ResizeDuringPaint) { 264 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ResizeDuringPaint)) {
264 LoadAndWait(GetURL("resize_during_paint.html")); 265 LoadAndWait(GetURL("resize_during_paint.html"));
265 } 266 }
266 267
267 IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInNewStream) { 268 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNewStream)) {
268 LoadAndWait(GetURL("self_delete_plugin_stream.html")); 269 LoadAndWait(GetURL("self_delete_plugin_stream.html"));
269 } 270 }
270 271
271 // This test asserts on Mac in plugin_host in the NPNVWindowNPObject case. 272 // This test asserts on Mac in plugin_host in the NPNVWindowNPObject case.
272 #if !(defined(OS_MACOSX) && !defined(NDEBUG)) 273 #if !(defined(OS_MACOSX) && !defined(NDEBUG))
273 // If this test flakes use http://crbug.com/95558. 274 // If this test flakes use http://crbug.com/95558.
274 IN_PROC_BROWSER_TEST_F(PluginTest, DeletePluginInDeallocate) { 275 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(DeletePluginInDeallocate)) {
275 LoadAndWait(GetURL("plugin_delete_in_deallocate.html")); 276 LoadAndWait(GetURL("plugin_delete_in_deallocate.html"));
276 } 277 }
277 #endif 278 #endif
278 279
279 #if defined(OS_WIN) 280 #if defined(OS_WIN)
280 281
281 IN_PROC_BROWSER_TEST_F(PluginTest, VerifyPluginWindowRect) { 282 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyPluginWindowRect)) {
282 LoadAndWait(GetURL("verify_plugin_window_rect.html")); 283 LoadAndWait(GetURL("verify_plugin_window_rect.html"));
283 } 284 }
284 285
285 // Tests that creating a new instance of a plugin while another one is handling 286 // Tests that creating a new instance of a plugin while another one is handling
286 // a paint message doesn't cause deadlock. 287 // a paint message doesn't cause deadlock.
287 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(CreateInstanceInPaint)) { 288 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(CreateInstanceInPaint)) {
288 LoadAndWait(GetURL("create_instance_in_paint.html")); 289 LoadAndWait(GetURL("create_instance_in_paint.html"));
289 } 290 }
290 291
291 // Tests that putting up an alert in response to a paint doesn't deadlock. 292 // Tests that putting up an alert in response to a paint doesn't deadlock.
292 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_AlertInWindowMessage) { 293 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_AlertInWindowMessage) {
293 NavigateToURL(shell(), GetURL("alert_in_window_message.html")); 294 NavigateToURL(shell(), GetURL("alert_in_window_message.html"));
294 295
295 WaitForAppModalDialog(shell()); 296 WaitForAppModalDialog(shell());
296 WaitForAppModalDialog(shell()); 297 WaitForAppModalDialog(shell());
297 } 298 }
298 299
299 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyNPObjectLifetimeTest)) { 300 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyNPObjectLifetimeTest)) {
300 LoadAndWait(GetURL("npobject_lifetime_test.html")); 301 LoadAndWait(GetURL("npobject_lifetime_test.html"));
301 } 302 }
302 303
303 // Tests that we don't crash or assert if NPP_New fails 304 // Tests that we don't crash or assert if NPP_New fails
304 IN_PROC_BROWSER_TEST_F(PluginTest, NewFails) { 305 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NewFails)) {
305 LoadAndWait(GetURL("new_fails.html")); 306 LoadAndWait(GetURL("new_fails.html"));
306 } 307 }
307 308
308 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNPNEvaluate)) { 309 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNPNEvaluate)) {
309 LoadAndWait(GetURL("execute_script_delete_in_npn_evaluate.html")); 310 LoadAndWait(GetURL("execute_script_delete_in_npn_evaluate.html"));
310 } 311 }
311 312
312 IN_PROC_BROWSER_TEST_F(PluginTest, 313 IN_PROC_BROWSER_TEST_F(PluginTest,
313 MAYBE(SelfDeleteCreatePluginInNPNEvaluate)) { 314 MAYBE(SelfDeleteCreatePluginInNPNEvaluate)) {
314 LoadAndWait(GetURL("npn_plugin_delete_create_in_evaluate.html")); 315 LoadAndWait(GetURL("npn_plugin_delete_create_in_evaluate.html"));
315 } 316 }
316 317
317 #endif // OS_WIN 318 #endif // OS_WIN
318 319
319 // If this flakes, reopen http://crbug.com/17645 320 // If this flakes, reopen http://crbug.com/17645
320 // As of 6 July 2011, this test is flaky on Windows (perhaps due to timing out). 321 // As of 6 July 2011, this test is flaky on Windows (perhaps due to timing out).
321 #if !defined(OS_MACOSX) 322 #if !defined(OS_MACOSX)
322 // Disabled on Mac because the plugin side isn't implemented yet, see 323 // Disabled on Mac because the plugin side isn't implemented yet, see
323 // "TODO(port)" in plugin_javascript_open_popup.cc. 324 // "TODO(port)" in plugin_javascript_open_popup.cc.
324 IN_PROC_BROWSER_TEST_F(PluginTest, OpenPopupWindowWithPlugin) { 325 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(OpenPopupWindowWithPlugin)) {
325 LoadAndWait(GetURL("get_javascript_open_popup_with_plugin.html")); 326 LoadAndWait(GetURL("get_javascript_open_popup_with_plugin.html"));
326 } 327 }
327 #endif 328 #endif
328 329
329 // Test checking the privacy mode is off. 330 // Test checking the privacy mode is off.
330 IN_PROC_BROWSER_TEST_F(PluginTest, PrivateDisabled) { 331 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateDisabled)) {
331 LoadAndWait(GetURL("private.html")); 332 LoadAndWait(GetURL("private.html"));
332 } 333 }
333 334
334 IN_PROC_BROWSER_TEST_F(PluginTest, ScheduleTimer) { 335 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ScheduleTimer)) {
335 LoadAndWait(GetURL("schedule_timer.html")); 336 LoadAndWait(GetURL("schedule_timer.html"));
336 } 337 }
337 338
338 IN_PROC_BROWSER_TEST_F(PluginTest, PluginThreadAsyncCall) { 339 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PluginThreadAsyncCall)) {
339 LoadAndWait(GetURL("plugin_thread_async_call.html")); 340 LoadAndWait(GetURL("plugin_thread_async_call.html"));
340 } 341 }
341 342
342 // Test checking the privacy mode is on. 343 // Test checking the privacy mode is on.
343 // If this flakes on Linux, use http://crbug.com/104380 344 // If this flakes on Linux, use http://crbug.com/104380
344 IN_PROC_BROWSER_TEST_F(PluginTest, PrivateEnabled) { 345 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateEnabled)) {
345 GURL url = GetURL("private.html"); 346 GURL url = GetURL("private.html");
346 url = GURL(url.spec() + "?private"); 347 url = GURL(url.spec() + "?private");
347 LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url); 348 LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url);
348 } 349 }
349 350
350 #if defined(OS_WIN) || defined(OS_MACOSX) 351 #if defined(OS_WIN) || defined(OS_MACOSX)
351 // Test a browser hang due to special case of multiple 352 // Test a browser hang due to special case of multiple
352 // plugin instances indulged in sync calls across renderer. 353 // plugin instances indulged in sync calls across renderer.
353 IN_PROC_BROWSER_TEST_F(PluginTest, MultipleInstancesSyncCalls) { 354 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MultipleInstancesSyncCalls)) {
354 LoadAndWait(GetURL("multiple_instances_sync_calls.html")); 355 LoadAndWait(GetURL("multiple_instances_sync_calls.html"));
355 } 356 }
356 #endif 357 #endif
357 358
358 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequestFailWrite) { 359 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURLRequestFailWrite)) {
359 GURL url(URLRequestMockHTTPJob::GetMockUrl( 360 GURL url(URLRequestMockHTTPJob::GetMockUrl(
360 base::FilePath().AppendASCII("npapi"). 361 base::FilePath().AppendASCII("npapi").
361 AppendASCII("plugin_url_request_fail_write.html"))); 362 AppendASCII("plugin_url_request_fail_write.html")));
362 LoadAndWait(url); 363 LoadAndWait(url);
363 } 364 }
364 365
365 #if defined(OS_WIN) 366 #if defined(OS_WIN)
366 IN_PROC_BROWSER_TEST_F(PluginTest, EnsureScriptingWorksInDestroy) { 367 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(EnsureScriptingWorksInDestroy)) {
367 LoadAndWait(GetURL("ensure_scripting_works_in_destroy.html")); 368 LoadAndWait(GetURL("ensure_scripting_works_in_destroy.html"));
368 } 369 }
369 370
370 // This test uses a Windows Event to signal to the plugin that it should crash 371 // This test uses a Windows Event to signal to the plugin that it should crash
371 // on NP_Initialize. 372 // on NP_Initialize.
372 IN_PROC_BROWSER_TEST_F(PluginTest, NoHangIfInitCrashes) { 373 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NoHangIfInitCrashes)) {
373 HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit"); 374 HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit");
374 SetEvent(crash_event); 375 SetEvent(crash_event);
375 LoadAndWait(GetURL("no_hang_if_init_crashes.html")); 376 LoadAndWait(GetURL("no_hang_if_init_crashes.html"));
376 CloseHandle(crash_event); 377 CloseHandle(crash_event);
377 } 378 }
378 #endif 379 #endif
379 380
380 // If this flakes on Mac, use http://crbug.com/111508 381 // If this flakes on Mac, use http://crbug.com/111508
381 IN_PROC_BROWSER_TEST_F(PluginTest, PluginReferrerTest) { 382 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PluginReferrerTest)) {
382 GURL url(URLRequestMockHTTPJob::GetMockUrl( 383 GURL url(URLRequestMockHTTPJob::GetMockUrl(
383 base::FilePath().AppendASCII("npapi"). 384 base::FilePath().AppendASCII("npapi").
384 AppendASCII("plugin_url_request_referrer_test.html"))); 385 AppendASCII("plugin_url_request_referrer_test.html")));
385 LoadAndWait(url); 386 LoadAndWait(url);
386 } 387 }
387 388
388 #if defined(OS_MACOSX) 389 #if defined(OS_MACOSX)
389 // Test is flaky, see http://crbug.com/134515. 390 // Test is flaky, see http://crbug.com/134515.
390 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) { 391 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) {
391 gfx::Rect bounds(50, 50, 400, 400); 392 gfx::Rect bounds(50, 50, 400, 400);
392 SetWindowBounds(shell()->window(), bounds); 393 SetWindowBounds(shell()->window(), bounds);
393 394
394 NavigateToURL(shell(), GetURL("convert_point.html")); 395 NavigateToURL(shell(), GetURL("convert_point.html"));
395 396
396 string16 expected_title(ASCIIToUTF16("OK")); 397 string16 expected_title(ASCIIToUTF16("OK"));
397 TitleWatcher title_watcher(shell()->web_contents(), expected_title); 398 TitleWatcher title_watcher(shell()->web_contents(), expected_title);
398 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); 399 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
399 // TODO(stuartmorgan): When the automation system supports sending clicks, 400 // TODO(stuartmorgan): When the automation system supports sending clicks,
400 // change the test to trigger on mouse-down rather than window focus. 401 // change the test to trigger on mouse-down rather than window focus.
401 402
402 // TODO: is this code still needed? It was here when it used to run in 403 // TODO: is this code still needed? It was here when it used to run in
403 // browser_tests. 404 // browser_tests.
404 //static_cast<WebContentsDelegate*>(shell())-> 405 //static_cast<WebContentsDelegate*>(shell())->
405 // ActivateContents(shell()->web_contents()); 406 // ActivateContents(shell()->web_contents());
406 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 407 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
407 } 408 }
408 #endif 409 #endif
409 410
410 IN_PROC_BROWSER_TEST_F(PluginTest, Flash) { 411 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Flash)) {
411 TestPlugin("flash.html"); 412 TestPlugin("flash.html");
412 } 413 }
413 414
414 #if defined(OS_WIN) 415 #if defined(OS_WIN)
415 // Windows only test 416 // Windows only test
416 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashSecurity) { 417 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashSecurity) {
417 TestPlugin("flash.html"); 418 TestPlugin("flash.html");
418 } 419 }
419 #endif // defined(OS_WIN) 420 #endif // defined(OS_WIN)
420 421
421 #if defined(OS_WIN) 422 #if defined(OS_WIN)
422 // TODO(port) Port the following tests to platforms that have the required 423 // TODO(port) Port the following tests to platforms that have the required
423 // plugins. 424 // plugins.
424 // Flaky: http://crbug.com/55915 425 // Flaky: http://crbug.com/55915
425 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Quicktime)) { 426 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Quicktime)) {
426 TestPlugin("quicktime.html"); 427 TestPlugin("quicktime.html");
427 } 428 }
428 429
429 // Disabled - http://crbug.com/44662 430 // Disabled - http://crbug.com/44662
430 IN_PROC_BROWSER_TEST_F(PluginTest, MediaPlayerNew) { 431 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MediaPlayerNew)) {
431 TestPlugin("wmp_new.html"); 432 TestPlugin("wmp_new.html");
432 } 433 }
433 434
434 // http://crbug.com/4809 435 // http://crbug.com/4809
435 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_MediaPlayerOld) { 436 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
436 TestPlugin("wmp_old.html"); 437 TestPlugin("wmp_old.html");
437 } 438 }
438 439
439 // Disabled - http://crbug.com/44673 440 // Disabled - http://crbug.com/44673
440 IN_PROC_BROWSER_TEST_F(PluginTest, Real) { 441 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Real)) {
441 TestPlugin("real.html"); 442 TestPlugin("real.html");
442 } 443 }
443 444
444 IN_PROC_BROWSER_TEST_F(PluginTest, FlashOctetStream) { 445 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(FlashOctetStream)) {
445 TestPlugin("flash-octet-stream.html"); 446 TestPlugin("flash-octet-stream.html");
446 } 447 }
447 448
448 #if defined(OS_WIN) 449 #if defined(OS_WIN)
449 // http://crbug.com/53926 450 // http://crbug.com/53926
450 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) { 451 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) {
451 #else 452 #else
452 IN_PROC_BROWSER_TEST_F(PluginTest, FlashLayoutWhilePainting) { 453 IN_PROC_BROWSER_TEST_F(PluginTest, FlashLayoutWhilePainting) {
453 #endif 454 #endif
454 TestPlugin("flash-layout-while-painting.html"); 455 TestPlugin("flash-layout-while-painting.html");
455 } 456 }
456 457
457 // http://crbug.com/8690 458 // http://crbug.com/8690
458 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { 459 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
459 TestPlugin("Java.html"); 460 TestPlugin("Java.html");
460 } 461 }
461 462
462 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { 463 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) {
463 TestPlugin("silverlight.html"); 464 TestPlugin("silverlight.html");
464 } 465 }
465 #endif // defined(OS_WIN) 466 #endif // defined(OS_WIN)
466 467
467 } // namespace content 468 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698