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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: oops, clumsy Created 4 years, 11 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b22176be3d0146f1886698244a880635a7d4eff9..8fe044af6b788f98bc7dae039c49922ad9fd6206 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1052,7 +1052,7 @@ void RenderFrameImpl::Initialize() {
if (IsMainFrame() &&
RenderProcess::current()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) {
- EnableMojoBindings();
+ EnableMojoBindings(false /* for_layout_tests */);
}
#if defined(ENABLE_PLUGINS)
@@ -5726,12 +5726,12 @@ void RenderFrameImpl::SendUpdateState() {
routing_id_, SingleHistoryItemToPageState(current_history_item_)));
}
-void RenderFrameImpl::EnableMojoBindings() {
+void RenderFrameImpl::EnableMojoBindings(bool for_layout_tests) {
// If an MojoBindingsController already exists for this RenderFrameImpl, avoid
// creating another one. It is not kept as a member, as it deletes itself when
// the frame is destroyed.
if (!RenderFrameObserverTracker<MojoBindingsController>::Get(this))
- new MojoBindingsController(this);
+ new MojoBindingsController(this, for_layout_tests);
}
void RenderFrameImpl::SendFailedProvisionalLoad(
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698