[Reland] Allow headless TabSocket in isolated worlds & remove obsolete logic

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c6c1e34d157bc3ba9c5771e9fbe6d5a2a0faa12f..0b2bafdd6129dce0c156701954b668cbec7a5d10 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6572,14 +6572,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),
@@ -6597,8 +6600,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);
   }
 }