| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 LoadAndWait(GetURL("get_javascript_url.html")); | 234 LoadAndWait(GetURL("get_javascript_url.html")); |
| 235 } | 235 } |
| 236 | 236 |
| 237 // Test that calling GetURL with a javascript URL and target=_self | 237 // Test that calling GetURL with a javascript URL and target=_self |
| 238 // works properly when the plugin is embedded in a subframe. | 238 // works properly when the plugin is embedded in a subframe. |
| 239 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) { | 239 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) { |
| 240 LoadAndWait(GetURL("get_javascript_url2.html")); | 240 LoadAndWait(GetURL("get_javascript_url2.html")); |
| 241 } | 241 } |
| 242 | 242 |
| 243 // Test is flaky on linux/cros/win builders. http://crbug.com/71904 | 243 // Test is flaky on linux/cros/win builders. http://crbug.com/71904 |
| 244 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_GetURLRedirectNotification) { | 244 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRedirectNotification) { |
| 245 LoadAndWait(GetURL("geturl_redirect_notify.html")); | 245 LoadAndWait(GetURL("geturl_redirect_notify.html")); |
| 246 } | 246 } |
| 247 | 247 |
| 248 // Tests that identity is preserved for NPObjects passed from a plugin | 248 // Tests that identity is preserved for NPObjects passed from a plugin |
| 249 // into JavaScript. | 249 // into JavaScript. |
| 250 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectIdentity)) { | 250 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectIdentity)) { |
| 251 LoadAndWait(GetURL("npobject_identity.html")); | 251 LoadAndWait(GetURL("npobject_identity.html")); |
| 252 } | 252 } |
| 253 | 253 |
| 254 // Tests that if an NPObject is proxies back to its original process, the | 254 // Tests that if an NPObject is proxies back to its original process, the |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 ResourceDispatcherHostDelegate* old_delegate = | 541 ResourceDispatcherHostDelegate* old_delegate = |
| 542 ResourceDispatcherHostImpl::Get()->delegate(); | 542 ResourceDispatcherHostImpl::Get()->delegate(); |
| 543 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); | 543 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); |
| 544 LoadAndWait(url); | 544 LoadAndWait(url); |
| 545 test_delegate.WaitForPluginRequest(); | 545 test_delegate.WaitForPluginRequest(); |
| 546 ASSERT_TRUE(test_delegate.found_cookie()); | 546 ASSERT_TRUE(test_delegate.found_cookie()); |
| 547 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); | 547 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); |
| 548 } | 548 } |
| 549 | 549 |
| 550 } // namespace content | 550 } // namespace content |
| OLD | NEW |