diff options
| author | Alex Moshchuk <alexmos@chromium.org> | 2015-09-16 11:56:33 -0700 |
|---|---|---|
| committer | Alex Moshchuk <alexmos@chromium.org> | 2015-09-16 18:57:51 +0000 |
| commit | 425727d0f9dd351954cd3dbd4dbf4401dca2e9bb (patch) | |
| tree | a6b59add9bc74bcb410669697412148b09ef23e2 | |
| parent | 1834bef3601500fa8e6cfec69cbfc3f567dfb267 (diff) | |
| download | chromium_src-425727d0f9dd351954cd3dbd4dbf4401dca2e9bb.zip chromium_src-425727d0f9dd351954cd3dbd4dbf4401dca2e9bb.tar.gz chromium_src-425727d0f9dd351954cd3dbd4dbf4401dca2e9bb.tar.bz2 | |
Fix flakiness in SitePerProcessBrowserTest.ProxyCreationSkipsSubtree.
One of the frame navigations in this test is checking the frame tree
after waiting on a TestFrameNavigationObserver and assuming that the
frame's child frames don't exist at that point, but that may not
be the case. This CL changes that navigation to a page without
subframes, which don't seem to be needed/used in the test.
https://crbug.com/514420#c5 has more details.
BUG=514420
TBR=nick@chromium.org
Review URL: https://codereview.chromium.org/1322333002
Cr-Commit-Position: refs/heads/master@{#347253}
(cherry picked from commit 617df037bc906d9b6479ecf59b364893cba3cc49)
Review URL: https://codereview.chromium.org/1346283002 .
Cr-Commit-Position: refs/branch-heads/2490@{#295}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
| -rw-r--r-- | content/browser/site_per_process_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 2464a38..5179137 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -1541,7 +1541,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, // Create the cross-site URL to navigate to. GURL cross_site_url = - embedded_test_server()->GetURL("foo.com", "/frame_tree/1-1.html"); + embedded_test_server()->GetURL("foo.com", "/frame_tree/title2.html"); // Load cross-site page into the second iframe without waiting for the // navigation to complete. Once LoadURLWithParams returns, we would expect @@ -1601,7 +1601,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, } // Load another cross-site page into the same iframe. - cross_site_url = embedded_test_server()->GetURL("bar.com", "/title2.html"); + cross_site_url = embedded_test_server()->GetURL("bar.com", "/title3.html"); { // Perform the same checks as the first cross-site navigation, since // there have been issues in subsequent cross-site navigations. Also ensure |