| 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 #endif | 289 #endif |
| 290 | 290 |
| 291 #if defined(OS_WIN) | 291 #if defined(OS_WIN) |
| 292 | 292 |
| 293 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyPluginWindowRect)) { | 293 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyPluginWindowRect)) { |
| 294 LoadAndWait(GetURL("verify_plugin_window_rect.html")); | 294 LoadAndWait(GetURL("verify_plugin_window_rect.html")); |
| 295 } | 295 } |
| 296 | 296 |
| 297 // Tests that creating a new instance of a plugin while another one is handling | 297 // Tests that creating a new instance of a plugin while another one is handling |
| 298 // a paint message doesn't cause deadlock. | 298 // a paint message doesn't cause deadlock. |
| 299 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(CreateInstanceInPaint)) { | 299 // http://crbug.com/406184 |
| 300 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_CreateInstanceInPaint) { |
| 300 LoadAndWait(GetURL("create_instance_in_paint.html")); | 301 LoadAndWait(GetURL("create_instance_in_paint.html")); |
| 301 } | 302 } |
| 302 | 303 |
| 303 // Tests that putting up an alert in response to a paint doesn't deadlock. | 304 // Tests that putting up an alert in response to a paint doesn't deadlock. |
| 304 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_AlertInWindowMessage) { | 305 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_AlertInWindowMessage) { |
| 305 NavigateToURL(shell(), GetURL("alert_in_window_message.html")); | 306 NavigateToURL(shell(), GetURL("alert_in_window_message.html")); |
| 306 | 307 |
| 307 WaitForAppModalDialog(shell()); | 308 WaitForAppModalDialog(shell()); |
| 308 WaitForAppModalDialog(shell()); | 309 WaitForAppModalDialog(shell()); |
| 309 } | 310 } |
| 310 | 311 |
| 311 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyNPObjectLifetimeTest)) { | 312 // http://crbug.com/406184 |
| 313 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_VerifyNPObjectLifetimeTest) { |
| 312 LoadAndWait(GetURL("npobject_lifetime_test.html")); | 314 LoadAndWait(GetURL("npobject_lifetime_test.html")); |
| 313 } | 315 } |
| 314 | 316 |
| 315 // Tests that we don't crash or assert if NPP_New fails | 317 // Tests that we don't crash or assert if NPP_New fails |
| 316 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NewFails)) { | 318 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NewFails)) { |
| 317 LoadAndWait(GetURL("new_fails.html")); | 319 LoadAndWait(GetURL("new_fails.html")); |
| 318 } | 320 } |
| 319 | 321 |
| 320 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNPNEvaluate)) { | 322 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNPNEvaluate)) { |
| 321 LoadAndWait(GetURL("execute_script_delete_in_npn_evaluate.html")); | 323 LoadAndWait(GetURL("execute_script_delete_in_npn_evaluate.html")); |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 ResourceDispatcherHostDelegate* old_delegate = | 557 ResourceDispatcherHostDelegate* old_delegate = |
| 556 ResourceDispatcherHostImpl::Get()->delegate(); | 558 ResourceDispatcherHostImpl::Get()->delegate(); |
| 557 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); | 559 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); |
| 558 LoadAndWait(url); | 560 LoadAndWait(url); |
| 559 test_delegate.WaitForPluginRequest(); | 561 test_delegate.WaitForPluginRequest(); |
| 560 ASSERT_TRUE(test_delegate.found_cookie()); | 562 ASSERT_TRUE(test_delegate.found_cookie()); |
| 561 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); | 563 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); |
| 562 } | 564 } |
| 563 | 565 |
| 564 } // namespace content | 566 } // namespace content |
| OLD | NEW |