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

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

Issue 2797753002: 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 // crbug.com/708139. 731 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) {
732 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessFragment) { 732 // This test is flaky with PlzNavigate (https://crbug.com/708139).
733 if (content::IsBrowserSideNavigationEnabled())
734 return;
735
733 ASSERT_TRUE(StartEmbeddedTestServer()); 736 ASSERT_TRUE(StartEmbeddedTestServer());
734 737
735 // See crossProcessFragment/f.html. 738 // See crossProcessFragment/f.html.
736 DelayLoadStartAndExecuteJavascript call_script3( 739 DelayLoadStartAndExecuteJavascript call_script3(
737 test_navigation_listener(), 740 test_navigation_listener(),
738 embedded_test_server()->GetURL("/test3"), 741 embedded_test_server()->GetURL("/test3"),
739 "updateFragment()", 742 "updateFragment()",
740 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port())); 743 base::StringPrintf("f.html?%u#foo", embedded_test_server()->port()));
741 744
742 // See crossProcessFragment/g.html. 745 // See crossProcessFragment/g.html.
743 DelayLoadStartAndExecuteJavascript call_script4( 746 DelayLoadStartAndExecuteJavascript call_script4(
744 test_navigation_listener(), 747 test_navigation_listener(),
745 embedded_test_server()->GetURL("/test4"), 748 embedded_test_server()->GetURL("/test4"),
746 "updateFragment()", 749 "updateFragment()",
747 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port())); 750 base::StringPrintf("g.html?%u#foo", embedded_test_server()->port()));
748 751
749 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment")) 752 ASSERT_TRUE(RunExtensionTest("webnavigation/crossProcessFragment"))
750 << message_; 753 << message_;
751 } 754 }
752 755
753 // crbug.com/708139. 756 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) {
754 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_CrossProcessHistory) { 757 // This test is flaky with PlzNavigate (https://crbug.com/708139).
758 if (content::IsBrowserSideNavigationEnabled())
759 return;
760
755 ASSERT_TRUE(StartEmbeddedTestServer()); 761 ASSERT_TRUE(StartEmbeddedTestServer());
756 762
757 // See crossProcessHistory/e.html. 763 // See crossProcessHistory/e.html.
758 DelayLoadStartAndExecuteJavascript call_script2( 764 DelayLoadStartAndExecuteJavascript call_script2(
759 test_navigation_listener(), 765 test_navigation_listener(),
760 embedded_test_server()->GetURL("/test2"), 766 embedded_test_server()->GetURL("/test2"),
761 "updateHistory()", 767 "updateHistory()",
762 "empty.html"); 768 "empty.html");
763 769
764 // See crossProcessHistory/h.html. 770 // See crossProcessHistory/h.html.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 "extensions/api_test/webnavigation/crash/b.html", 817 "extensions/api_test/webnavigation/crash/b.html",
812 embedded_test_server()->port())); 818 embedded_test_server()->port()));
813 ui_test_utils::NavigateToURL(browser(), url); 819 ui_test_utils::NavigateToURL(browser(), url);
814 820
815 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 821 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
816 } 822 }
817 823
818 #endif 824 #endif
819 825
820 } // namespace extensions 826 } // 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