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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
319 FilePath(FILE_PATH_LITERAL( | 319 FilePath(FILE_PATH_LITERAL( |
320 "npapi/plugin_url_request_fail_write.html")))); | 320 "npapi/plugin_url_request_fail_write.html")))); |
321 | 321 |
322 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 322 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
323 | 323 |
324 WaitForFinish("geturl_fail_write", "1", url, kTestCompleteCookie, | 324 WaitForFinish("geturl_fail_write", "1", url, kTestCompleteCookie, |
325 kTestCompleteSuccess, action_max_timeout_ms()); | 325 kTestCompleteSuccess, action_max_timeout_ms()); |
326 } | 326 } |
327 | 327 |
328 #if defined(OS_WIN) | 328 #if defined(OS_WIN) |
329 // Starting failing during WebKit roll 72952:72986, see http://crbug.com/64874 | 329 // Starting failing during WebKit roll 72952:72986, see http://crbug.com/64874 |
Paweł Hajdan Jr.
2010/12/02 09:17:27
nit: I think you also want to remove the comment.
| |
330 TEST_F(NPAPITesterBase, DISABLED_EnsureScriptingWorksInDestroy) { | 330 TEST_F(NPAPITesterBase, EnsureScriptingWorksInDestroy) { |
331 if (UITest::in_process_renderer()) | 331 if (UITest::in_process_renderer()) |
332 return; | 332 return; |
333 | 333 |
334 const FilePath test_case( | 334 const FilePath test_case( |
335 FILE_PATH_LITERAL("ensure_scripting_works_in_destroy.html")); | 335 FILE_PATH_LITERAL("ensure_scripting_works_in_destroy.html")); |
336 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); | 336 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); |
337 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 337 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
338 WaitForFinish("ensure_scripting_works_in_destroy", "1", url, | 338 WaitForFinish("ensure_scripting_works_in_destroy", "1", url, |
339 kTestCompleteCookie, kTestCompleteSuccess, | 339 kTestCompleteCookie, kTestCompleteSuccess, |
340 action_max_timeout_ms()); | 340 action_max_timeout_ms()); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
412 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 412 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
413 | 413 |
414 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 414 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
415 ASSERT_TRUE(tab.get()); | 415 ASSERT_TRUE(tab.get()); |
416 | 416 |
417 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 417 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
418 | 418 |
419 WaitForFinish("setup", "1", url, kTestCompleteCookie, | 419 WaitForFinish("setup", "1", url, kTestCompleteCookie, |
420 kTestCompleteSuccess, action_max_timeout_ms()); | 420 kTestCompleteSuccess, action_max_timeout_ms()); |
421 } | 421 } |
OLD | NEW |