content/browser/web_contents/render_view_host_manager_unittest.cc - Issue 10690048: Clean up RenderViewHostManager swapping logic.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/render_view_host_manager_unittest.cc

Issue 10690048: Clean up RenderViewHostManager swapping logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/web_contents/render_view_host_manager_unittest.cc

diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc

index 5dec92c6f05d0b7c050ad8fcfa614f4e91be2a78..8a08e5e844c52ee6510dd3d54f88a780cb5aa86d 100644

--- a/content/browser/web_contents/render_view_host_manager_unittest.cc

+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc

@@ -162,7 +162,8 @@ class RenderViewHostManagerTest

bool ShouldSwapProcesses(RenderViewHostManager* manager,

const NavigationEntryImpl* cur_entry,

const NavigationEntryImpl* new_entry) const {

- return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);

+ return manager->ShouldSwapBrowsingInstanceForNavigation(cur_entry,

+ new_entry);

}

private: