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

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: Removed InitializeWebUI Created 5 years, 3 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
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,

Powered by Google App Engine
This is Rietveld 408576698