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

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 6541 matching lines @@
 
 void RenderFrameImpl::SendUpdateState() {
   if (current_history_item_.IsNull())
     return;
 
   Send(new FrameHostMsg_UpdateState(
       routing_id_, SingleHistoryItemToPageState(current_history_item_)));
 }
 
 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),
             0);
 
   DCHECK_EQ(RenderProcess::current()->GetEnabledBindings(), enabled_bindings_);
 
   // 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))
     return;
 
   if (IsMainFrame() && enabled_bindings_ & BINDINGS_POLICY_WEB_UI) {
     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);
   }
 }
 
 void RenderFrameImpl::SendFailedProvisionalLoad(
     const blink::WebURLRequest& request,
     const blink::WebURLError& error,
     blink::WebLocalFrame* frame) {
   bool show_repost_interstitial =
       (error.reason == net::ERR_CACHE_MISS &&
        base::EqualsASCII(request.HttpMethod().Utf16(), "POST"));
@@ skipping 468 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content