OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
10 #include "base/test/thread_test_helper.h" | 10 #include "base/test/thread_test_helper.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 url_path.append(path); | 30 url_path.append(path); |
31 return test_server()->GetURL(url_path); | 31 return test_server()->GetURL(url_path); |
32 } | 32 } |
33 | 33 |
34 // Verifies that reparenting of iframe between different pages works as | 34 // Verifies that reparenting of iframe between different pages works as |
35 // expected, including smooth transfer of resources that are still being loaded. | 35 // expected, including smooth transfer of resources that are still being loaded. |
36 // The test failure manifests as the ongoing XHR request is not finishing | 36 // The test failure manifests as the ongoing XHR request is not finishing |
37 // (silently aborted) when the test iframe is transferred between pages (and | 37 // (silently aborted) when the test iframe is transferred between pages (and |
38 // the original page closes). This causes the final navigation to not complete | 38 // the original page closes). This causes the final navigation to not complete |
39 // and test terminated due to a timeout. | 39 // and test terminated due to a timeout. |
40 | 40 IN_PROC_BROWSER_TEST_F(MagicIframeBrowserTest, TransferIframeCloseWindow) { |
41 // Currently disabled (http://crbug.com/55200, work in progress). | |
42 IN_PROC_BROWSER_TEST_F(MagicIframeBrowserTest, | |
43 DISABLED_TransferIframeCloseWindow) { | |
44 ASSERT_TRUE(test_server()->Start()); | 41 ASSERT_TRUE(test_server()->Start()); |
45 GURL url(GetTestURL("iframe-reparenting-close-window.html")); | 42 GURL url(GetTestURL("iframe-reparenting-close-window.html")); |
46 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), url, 3); | 43 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), url, 3); |
47 std::string result; | 44 std::string result; |
48 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( | 45 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( |
49 browser()->GetSelectedTabContents()->render_view_host(), L"", | 46 browser()->GetSelectedTabContents()->render_view_host(), L"", |
50 L"window.domAutomationController.send(getLog())", &result)); | 47 L"window.domAutomationController.send(getLog())", &result)); |
51 ASSERT_NE(result.find("DONE"), std::string::npos) << result; | 48 ASSERT_NE(result.find("DONE"), std::string::npos) << result; |
52 } | 49 } |
53 | 50 |
OLD | NEW |