Expose mojo bindings to subframes in layout tests.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 80535bd5241f15e5ee2348b02388ca1fac55e23c..9c5652074d1b238490b15b21dfd703f29305ead2 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2386,20 +2386,15 @@ void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
     // WebUIExtensionData deletes itself when we're destroyed.
     new WebUIExtensionData(this);
 
-    if (main_render_frame_)
-      main_render_frame_->EnableMojoBindings(false /* for_layout_tests */);
-  }
-
-  if ((enabled_bindings_flags & BINDINGS_POLICY_MOJO) &&
-      !(enabled_bindings_ & BINDINGS_POLICY_MOJO) &&
-      main_render_frame_) {
-    main_render_frame_->EnableMojoBindings(true /* for_layout_tests */);
   }
 
   enabled_bindings_ |= enabled_bindings_flags;
 
   // Keep track of the total bindings accumulated in this process.
   RenderProcess::current()->AddBindings(enabled_bindings_flags);
+
+  if (main_render_frame_)
+    main_render_frame_->MaybeEnableMojoBindings();
 }
 
 void RenderViewImpl::OnDragTargetDragEnter(const DropData& drop_data,