Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index bf90b0ae15404e326ea89b1e84085293b60788ed..571216adf61530837b7cfa085f6e5f955bf13fcf 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -6559,14 +6559,17 @@ void RenderFrameImpl::SendUpdateState() { |
} |
void RenderFrameImpl::MaybeEnableMojoBindings() { |
- // BINDINGS_POLICY_WEB_UI, BINDINGS_POLICY_MOJO and BINDINGS_POLICY_HEADLESS |
- // are mutually exclusive. They provide access to Mojo bindings, but do so in |
- // incompatible ways. |
- const int kAllBindingsTypes = |
- BINDINGS_POLICY_WEB_UI | BINDINGS_POLICY_MOJO | BINDINGS_POLICY_HEADLESS; |
+ // BINDINGS_POLICY_WEB_UI, BINDINGS_POLICY_MOJO, |
+ // BINDINGS_POLICY_HEADLESS_MAIN_WORLD and |
+ // BINDINGS_POLICY_HEADLESS_ISOLATED_WORLD are mutually exclusive. They |
+ // provide access to Mojo bindings, but do so in incompatible ways. |
+ const int kAllBindingsTypes = BINDINGS_POLICY_WEB_UI | BINDINGS_POLICY_MOJO | |
+ BINDINGS_POLICY_HEADLESS_MAIN_WORLD | |
+ BINDINGS_POLICY_HEADLESS_ISOLATED_WORLD; |
// Make sure that at most one of BINDINGS_POLICY_WEB_UI, BINDINGS_POLICY_MOJO |
- // and BINDINGS_POLICY_HEADLESS have been set. |
+ // BINDINGS_POLICY_HEADLESS_MAIN_WORLD and |
+ // BINDINGS_POLICY_HEADLESS_ISOLATED_WORLD have been set. |
// NOTE x & (x - 1) == 0 is true iff x is zero or a power of two. |
DCHECK_EQ((enabled_bindings_ & kAllBindingsTypes) & |
((enabled_bindings_ & kAllBindingsTypes) - 1), |
@@ -6584,8 +6587,6 @@ void RenderFrameImpl::MaybeEnableMojoBindings() { |
new MojoBindingsController(this, MojoBindingsType::FOR_WEB_UI); |
} else if (enabled_bindings_ & BINDINGS_POLICY_MOJO) { |
new MojoBindingsController(this, MojoBindingsType::FOR_LAYOUT_TESTS); |
- } else if (enabled_bindings_ & BINDINGS_POLICY_HEADLESS) { |
- new MojoBindingsController(this, MojoBindingsType::FOR_HEADLESS); |
} |
} |