Expose mojo bindings to subframes in layout tests.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 2368 matching lines @@
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
 
 void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
   if ((enabled_bindings_flags & BINDINGS_POLICY_WEB_UI) &&
       !(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) {
     // 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,
                                            const gfx::Point& client_point,
                                            const gfx::Point& screen_point,
                                            WebDragOperationsMask ops,
                                            int key_modifiers) {
   WebDragOperation operation = webview()->dragTargetDragEnter(
       DropDataToWebDragData(drop_data),
       ConvertWindowPointToViewport(client_point),
@@ skipping 1118 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 }  // namespace content