diff options
| author | clamy <clamy@chromium.org> | 2016-01-28 08:39:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 16:41:34 +0000 |
| commit | dd8101d22038e533c44d64ef47aafbe303108ed0 (patch) | |
| tree | 800f5aa634215709a5da17d84265d69b787472bc | |
| parent | 22abec6057fd7ac143e3eb1eb3c89de41b07cbb4 (diff) | |
| download | chromium_src-dd8101d22038e533c44d64ef47aafbe303108ed0.zip chromium_src-dd8101d22038e533c44d64ef47aafbe303108ed0.tar.gz chromium_src-dd8101d22038e533c44d64ef47aafbe303108ed0.tar.bz2 | |
PlzNavigate: fix expectation in NavigationControllerBrowserTest
This fixes one expectation in
NavigationControllerBrowserTest.FrameNavigationEntry_FrameUniqueName following
PlzNavigate switch to frame history entries.
BUG=575210
Review URL: https://codereview.chromium.org/1631273003
Cr-Commit-Position: refs/heads/master@{#372104}
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl_browsertest.cc | 14 | ||||
| -rw-r--r-- | testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc index 26c9fd8..484e05b 100644 --- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc +++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc @@ -2605,8 +2605,18 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, "bar.com", "/navigation_controller/simple_page_1.html")); NavigateFrameToURL(foo_subframe, bar_url); EXPECT_TRUE(WaitForLoadStop(shell()->web_contents())); - EXPECT_NE(main_site_instance, - foo_subframe->current_frame_host()->GetSiteInstance()); + + // When run just with subframe navigation entries enabled and not in + // site-per-process-mode the subframe should be in the same SiteInstance as + // its parent. + if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) { + EXPECT_EQ(main_site_instance, + foo_subframe->current_frame_host()->GetSiteInstance()); + } else { + EXPECT_NE(main_site_instance, + foo_subframe->current_frame_host()->GetSiteInstance()); + } + foo_subframe_entry = controller.GetLastCommittedEntry()->GetFrameEntry(foo_subframe); EXPECT_EQ(named_subframe_name, foo_subframe_entry->frame_unique_name()); diff --git a/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter b/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter index ad61560..1ba78c2 100644 --- a/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter +++ b/testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter @@ -16,7 +16,6 @@ -LoFiResourceDispatcherHostBrowserTest.ShouldEnableLoFiModeReload -LoFiResourceDispatcherHostBrowserTest.ShouldEnableLoFiModeReloadDisableLoFi -NavigationControllerBrowserTest.CorrectLengthWithCurrentItemReplacement --NavigationControllerBrowserTest.FrameNavigationEntry_FrameUniqueName -NavigationControllerBrowserTest.FrameNavigationEntry_SubframeHistoryFallback -NavigationControllerBrowserTest.NavigationTypeClassification_ClientSideRedirect -NavigationControllerBrowserTest.NavigationTypeClassification_EmptyGURL |