OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 // windows headers | 8 // windows headers |
9 #include <comutil.h> | 9 #include <comutil.h> |
10 #include <shellapi.h> | 10 #include <shellapi.h> |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 // Test various calls to GetURL for javascript URLs with | 71 // Test various calls to GetURL for javascript URLs with |
72 // non NULL targets from a plugin. | 72 // non NULL targets from a plugin. |
73 TEST_F(NPAPITesterBase, GetJavaScriptURL) { | 73 TEST_F(NPAPITesterBase, GetJavaScriptURL) { |
74 const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url.html")); | 74 const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url.html")); |
75 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); | 75 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); |
76 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 76 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
77 WaitForFinish("getjavascripturl", "1", url, kTestCompleteCookie, | 77 WaitForFinish("getjavascripturl", "1", url, kTestCompleteCookie, |
78 kTestCompleteSuccess, action_max_timeout_ms()); | 78 kTestCompleteSuccess, action_max_timeout_ms()); |
79 } | 79 } |
80 | 80 |
81 // Flaky test: http://crbug.com/29020 | |
82 // Test that calling GetURL with a javascript URL and target=_self | 81 // Test that calling GetURL with a javascript URL and target=_self |
83 // works properly when the plugin is embedded in a subframe. | 82 // works properly when the plugin is embedded in a subframe. |
84 TEST_F(NPAPITesterBase, FLAKY_GetJavaScriptURL2) { | 83 TEST_F(NPAPITesterBase, GetJavaScriptURL2) { |
85 const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html")); | 84 const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html")); |
86 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); | 85 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); |
87 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 86 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
88 WaitForFinish("getjavascripturl2", "1", url, kTestCompleteCookie, | 87 WaitForFinish("getjavascripturl2", "1", url, kTestCompleteCookie, |
89 kTestCompleteSuccess, action_max_timeout_ms()); | 88 kTestCompleteSuccess, action_max_timeout_ms()); |
90 } | 89 } |
91 | 90 |
92 // Tests that if an NPObject is proxies back to its original process, the | 91 // Tests that if an NPObject is proxies back to its original process, the |
93 // original pointer is returned and not a proxy. If this fails the plugin | 92 // original pointer is returned and not a proxy. If this fails the plugin |
94 // will crash. | 93 // will crash. |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 403 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
405 | 404 |
406 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 405 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
407 ASSERT_TRUE(tab.get()); | 406 ASSERT_TRUE(tab.get()); |
408 | 407 |
409 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 408 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
410 | 409 |
411 WaitForFinish("setup", "1", url, kTestCompleteCookie, | 410 WaitForFinish("setup", "1", url, kTestCompleteCookie, |
412 kTestCompleteSuccess, action_max_timeout_ms()); | 411 kTestCompleteSuccess, action_max_timeout_ms()); |
413 } | 412 } |
OLD | NEW |