OLD | NEW |
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/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 // Disabled - http://crbug.com/44662 | 444 // Disabled - http://crbug.com/44662 |
445 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MediaPlayerNew)) { | 445 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MediaPlayerNew)) { |
446 TestPlugin("wmp_new.html"); | 446 TestPlugin("wmp_new.html"); |
447 } | 447 } |
448 | 448 |
449 // Disabled - http://crbug.com/44673 | 449 // Disabled - http://crbug.com/44673 |
450 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Real)) { | 450 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Real)) { |
451 TestPlugin("real.html"); | 451 TestPlugin("real.html"); |
452 } | 452 } |
453 | 453 |
454 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(FlashOctetStream)) { | 454 // http://crbug.com/320041 |
| 455 #if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \ |
| 456 (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) |
| 457 #define MAYBE_FlashOctetStream DISABLED_FlashOctetStream |
| 458 #else |
| 459 #define MAYBE_FlashOctetStream FlashOctetStream |
| 460 #endif |
| 461 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE_FlashOctetStream) { |
455 TestPlugin("flash-octet-stream.html"); | 462 TestPlugin("flash-octet-stream.html"); |
456 } | 463 } |
457 | 464 |
458 #if defined(OS_WIN) | 465 #if defined(OS_WIN) |
459 // http://crbug.com/53926 | 466 // http://crbug.com/53926 |
460 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) { | 467 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) { |
461 #else | 468 #else |
462 IN_PROC_BROWSER_TEST_F(PluginTest, FlashLayoutWhilePainting) { | 469 IN_PROC_BROWSER_TEST_F(PluginTest, FlashLayoutWhilePainting) { |
463 #endif | 470 #endif |
464 TestPlugin("flash-layout-while-painting.html"); | 471 TestPlugin("flash-layout-while-painting.html"); |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 ResourceDispatcherHostDelegate* old_delegate = | 548 ResourceDispatcherHostDelegate* old_delegate = |
542 ResourceDispatcherHostImpl::Get()->delegate(); | 549 ResourceDispatcherHostImpl::Get()->delegate(); |
543 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); | 550 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); |
544 LoadAndWait(url); | 551 LoadAndWait(url); |
545 test_delegate.WaitForPluginRequest(); | 552 test_delegate.WaitForPluginRequest(); |
546 ASSERT_TRUE(test_delegate.found_cookie()); | 553 ASSERT_TRUE(test_delegate.found_cookie()); |
547 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); | 554 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); |
548 } | 555 } |
549 | 556 |
550 } // namespace content | 557 } // namespace content |
OLD | NEW |