Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 2803013002: Revert of Disable CrossProcessHistory and CrossProcessFragment with PlzNavigate. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 base::UTF8ToUTF16("navigate2()")); 721 base::UTF8ToUTF16("navigate2()"));
722 722
723 // Wait for the same-site navigation to start and resume the cross-site 723 // Wait for the same-site navigation to start and resume the cross-site
724 // one, allowing it to commit. 724 // one, allowing it to commit.
725 same_site_load.Wait(); 725 same_site_load.Wait();
726 test_navigation_listener()->Resume(cross_site_url); 726 test_navigation_listener()->Resume(cross_site_url);
727 727
728 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 728 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
729 } 729 }
730 730
731 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) { 731 // crbug.com/708139.
732 // This test is flaky with PlzNavigate (https://crbug.com/708139). 732 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessFragment) {
733 if (content::IsBrowserSideNavigationEnabled())
734 return;
735
736 ASSERT_TRUE(StartEmbeddedTestServer()); 733 ASSERT_TRUE(StartEmbeddedTestServer());
737 734
738 // See crossProcessFragment/f.html. 735 // See crossProcessFragment/f.html.
739 DelayLoadStartAndExecuteJavascript call_script3( 736 DelayLoadStartAndExecuteJavascript call_script3(
740 test_navigation_listener(), 737 test_navigation_listener(),
741 embedded_test_server()->GetURL("/test3"), 738 embedded_test_server()->GetURL("/test3"),
742 "updateFragment()", 739 "updateFragment()",
743 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port())); 740 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port()));
744 741
745 // See crossProcessFragment/g.html. 742 // See crossProcessFragment/g.html.
746 DelayLoadStartAndExecuteJavascript call_script4( 743 DelayLoadStartAndExecuteJavascript call_script4(
747 test_navigation_listener(), 744 test_navigation_listener(),
748 embedded_test_server()->GetURL("/test4"), 745 embedded_test_server()->GetURL("/test4"),
749 "updateFragment()", 746 "updateFragment()",
750 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); 747 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port()));
751 748
752 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) 749 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment"))
753 << message_; 750 << message_;
754 } 751 }
755 752
756 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) { 753 // crbug.com/708139.
757 // This test is flaky with PlzNavigate (https://crbug.com/708139). 754 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessHistory) {
758 if (content::IsBrowserSideNavigationEnabled())
759 return;
760
761 ASSERT_TRUE(StartEmbeddedTestServer()); 755 ASSERT_TRUE(StartEmbeddedTestServer());
762 756
763 // See crossProcessHistory/e.html. 757 // See crossProcessHistory/e.html.
764 DelayLoadStartAndExecuteJavascript call_script2( 758 DelayLoadStartAndExecuteJavascript call_script2(
765 test_navigation_listener(), 759 test_navigation_listener(),
766 embedded_test_server()->GetURL("/test2"), 760 embedded_test_server()->GetURL("/test2"),
767 "updateHistory()", 761 "updateHistory()",
768 "empty.html"); 762 "empty.html");
769 763
770 // See crossProcessHistory/h.html. 764 // See crossProcessHistory/h.html.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 "extensions/api_test/webnavigation/crash/b.html", 811 "extensions/api_test/webnavigation/crash/b.html",
818 embedded_test_server()->port())); 812 embedded_test_server()->port()));
819 ui_test_utils::NavigateToURL(browser(), url); 813 ui_test_utils::NavigateToURL(browser(), url);
820 814
821 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 815 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
822 } 816 }
823 817
824 #endif 818 #endif
825 819
826 } // namespace extensions 820 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698