content/browser/frame_host/render_frame_host_manager_unittest.cc - Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost.

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/frame_host/render_frame_host_manager_unittest.cc

Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed uninitialized variable and missing call to WebUIImpl::RenderViewReused. Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/render_frame_host_impl.cc ('K') | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager_unittest.cc

diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc

index a6d04cde898ee2a6118990c8c7427b528d7cb1ec..d2898c2f46952cf01fbe1d2e67a625203f3e41bf 100644

--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc

+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc

@@ -72,7 +72,9 @@ class RenderFrameHostManagerTestWebUIControllerFactory

WebUI::TypeID GetWebUIType(BrowserContext* browser_context,

const GURL& url) const override {

- return WebUI::kNoWebUI;

+ if (!(should_create_webui_ && HasWebUIScheme(url)))

+ return WebUI::kNoWebUI;

+ return const_cast<RenderFrameHostManagerTestWebUIControllerFactory*>(this);

}

bool UseWebUIForURL(BrowserContext* browser_context,