| 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 <list> | 5 #include <list> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 base::UTF8ToUTF16("navigate2()")); | 719 base::UTF8ToUTF16("navigate2()")); |
| 720 | 720 |
| 721 // Wait for the same-site navigation to start and resume the cross-site | 721 // Wait for the same-site navigation to start and resume the cross-site |
| 722 // one, allowing it to commit. | 722 // one, allowing it to commit. |
| 723 same_site_load.Wait(); | 723 same_site_load.Wait(); |
| 724 test_navigation_listener()->Resume(cross_site_url); | 724 test_navigation_listener()->Resume(cross_site_url); |
| 725 | 725 |
| 726 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 726 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 727 } | 727 } |
| 728 | 728 |
| 729 // http://crbug.com/703546 | 729 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) { |
| 730 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessFragment) { | |
| 731 ASSERT_TRUE(StartEmbeddedTestServer()); | 730 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 732 | 731 |
| 733 // See crossProcessFragment/f.html. | 732 // See crossProcessFragment/f.html. |
| 734 DelayLoadStartAndExecuteJavascript call_script3( | 733 DelayLoadStartAndExecuteJavascript call_script3( |
| 735 test_navigation_listener(), | 734 test_navigation_listener(), |
| 736 embedded_test_server()->GetURL("/test3"), | 735 embedded_test_server()->GetURL("/test3"), |
| 737 "updateFragment()", | 736 "updateFragment()", |
| 738 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port())); | 737 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port())); |
| 739 | 738 |
| 740 // See crossProcessFragment/g.html. | 739 // See crossProcessFragment/g.html. |
| 741 DelayLoadStartAndExecuteJavascript call_script4( | 740 DelayLoadStartAndExecuteJavascript call_script4( |
| 742 test_navigation_listener(), | 741 test_navigation_listener(), |
| 743 embedded_test_server()->GetURL("/test4"), | 742 embedded_test_server()->GetURL("/test4"), |
| 744 "updateFragment()", | 743 "updateFragment()", |
| 745 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); | 744 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); |
| 746 | 745 |
| 747 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) | 746 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) |
| 748 << message_; | 747 << message_; |
| 749 } | 748 } |
| 750 | 749 |
| 751 // http://crbug.com/703546 | 750 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) { |
| 752 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessHistory) { | |
| 753 ASSERT_TRUE(StartEmbeddedTestServer()); | 751 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 754 | 752 |
| 755 // See crossProcessHistory/e.html. | 753 // See crossProcessHistory/e.html. |
| 756 DelayLoadStartAndExecuteJavascript call_script2( | 754 DelayLoadStartAndExecuteJavascript call_script2( |
| 757 test_navigation_listener(), | 755 test_navigation_listener(), |
| 758 embedded_test_server()->GetURL("/test2"), | 756 embedded_test_server()->GetURL("/test2"), |
| 759 "updateHistory()", | 757 "updateHistory()", |
| 760 "empty.html"); | 758 "empty.html"); |
| 761 | 759 |
| 762 // See crossProcessHistory/h.html. | 760 // See crossProcessHistory/h.html. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 "extensions/api_test/webnavigation/crash/b.html", | 807 "extensions/api_test/webnavigation/crash/b.html", |
| 810 embedded_test_server()->port())); | 808 embedded_test_server()->port())); |
| 811 ui_test_utils::NavigateToURL(browser(), url); | 809 ui_test_utils::NavigateToURL(browser(), url); |
| 812 | 810 |
| 813 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 811 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 814 } | 812 } |
| 815 | 813 |
| 816 #endif | 814 #endif |
| 817 | 815 |
| 818 } // namespace extensions | 816 } // namespace extensions |
| OLD | NEW |