| 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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 DelayLoadStartAndExecuteJavascript call_script4( | 742 DelayLoadStartAndExecuteJavascript call_script4( |
| 743 test_navigation_listener(), | 743 test_navigation_listener(), |
| 744 embedded_test_server()->GetURL("/test4"), | 744 embedded_test_server()->GetURL("/test4"), |
| 745 "updateFragment()", | 745 "updateFragment()", |
| 746 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); | 746 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); |
| 747 | 747 |
| 748 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) | 748 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) |
| 749 << message_; | 749 << message_; |
| 750 } | 750 } |
| 751 | 751 |
| 752 // crbug.com/708139. | 752 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) { |
| 753 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessHistory) { | |
| 754 ASSERT_TRUE(StartEmbeddedTestServer()); | 753 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 755 | 754 |
| 756 // See crossProcessHistory/e.html. | 755 // See crossProcessHistory/e.html. |
| 757 DelayLoadStartAndExecuteJavascript call_script2( | 756 DelayLoadStartAndExecuteJavascript call_script2( |
| 758 test_navigation_listener(), | 757 test_navigation_listener(), |
| 759 embedded_test_server()->GetURL("/test2"), | 758 embedded_test_server()->GetURL("/test2"), |
| 760 "updateHistory()", | 759 "updateHistory()", |
| 761 "empty.html"); | 760 "empty.html"); |
| 762 | 761 |
| 763 // See crossProcessHistory/h.html. | 762 // See crossProcessHistory/h.html. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 810 "extensions/api_test/webnavigation/crash/b.html", | 809 "extensions/api_test/webnavigation/crash/b.html", |
| 811 embedded_test_server()->port())); | 810 embedded_test_server()->port())); |
| 812 ui_test_utils::NavigateToURL(browser(), url); | 811 ui_test_utils::NavigateToURL(browser(), url); |
| 813 | 812 |
| 814 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 813 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 815 } | 814 } |
| 816 | 815 |
| 817 #endif | 816 #endif |
| 818 | 817 |
| 819 } // namespace extensions | 818 } // namespace extensions |
| OLD | NEW |