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

headless/lib/browser/headless_browser_context_impl.cc

 // Copyright 2015 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 "headless/lib/browser/headless_browser_context_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "headless/lib/browser/headless_net_log.h"
 #include "headless/lib/browser/headless_permission_manager.h"
 #include "headless/lib/browser/headless_url_request_context_getter.h"
 #include "headless/public/util/black_hole_protocol_handler.h"
 #include "headless/public/util/in_memory_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace headless {
 
-namespace {
-const char kHeadlessMojomProtocol[] = "headless-mojom";
-}
-
 // Contains net::URLRequestContextGetter required for resource loading.
 // Must be destructed on the IO thread as per content::ResourceContext
 // requirements.
 class HeadlessResourceContext : public content::ResourceContext {
  public:
   HeadlessResourceContext();
   ~HeadlessResourceContext() override;
 
   // ResourceContext implementation:
   net::HostResolver* GetHostResolver() override;
@@ skipping 361 matching lines @@
 
 HeadlessBrowserContext::Builder&
 HeadlessBrowserContext::Builder::SetOverrideWebPreferencesCallback(
     base::Callback<void(WebPreferences*)> callback) {
   options_->override_web_preferences_callback_ = std::move(callback);
   return *this;
 }
 
 HeadlessBrowserContext* HeadlessBrowserContext::Builder::Build() {
   if (!mojo_bindings_.empty()) {
-    std::unique_ptr<InMemoryProtocolHandler> headless_mojom_protocol_handler(
-        new InMemoryProtocolHandler());
-    for (const MojoBindings& binding : mojo_bindings_) {
-      headless_mojom_protocol_handler->InsertResponse(
-          binding.mojom_name,
-          InMemoryProtocolHandler::Response(binding.js_bindings,
-                                            "application/javascript"));
-    }
-    DCHECK(options_->protocol_handlers_.find(kHeadlessMojomProtocol) ==
-           options_->protocol_handlers_.end());
-    options_->protocol_handlers_[kHeadlessMojomProtocol] =
-        std::move(headless_mojom_protocol_handler);
-
     // Unless you know what you're doing it's unsafe to allow http/https for a
     // context with mojo bindings.
     if (!enable_http_and_https_if_mojo_used_) {
       options_->protocol_handlers_[url::kHttpScheme] =
           base::MakeUnique<BlackHoleProtocolHandler>();
       options_->protocol_handlers_[url::kHttpsScheme] =
           base::MakeUnique<BlackHoleProtocolHandler>();
     }
   }
 
   return browser_->CreateBrowserContext(this);
 }
 
 HeadlessBrowserContext::Builder::MojoBindings::MojoBindings() {}
 
 HeadlessBrowserContext::Builder::MojoBindings::MojoBindings(
     const std::string& mojom_name,
     const std::string& js_bindings)
     : mojom_name(mojom_name), js_bindings(js_bindings) {}
 
 HeadlessBrowserContext::Builder::MojoBindings::~MojoBindings() {}
 
 }  // namespace headless