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

headless/lib/browser/headless_web_contents_impl.h

 // 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.
 
 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 97 matching lines @@
 
   void InitializeScreen(const gfx::Size& initial_size);
   using MojoService = HeadlessWebContents::Builder::MojoService;
 
   class Delegate;
   std::unique_ptr<Delegate> web_contents_delegate_;
   std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_;
   std::unique_ptr<content::WebContents> web_contents_;
   scoped_refptr<content::DevToolsAgentHost> agent_host_;
   std::list<MojoService> mojo_services_;
+  bool inject_mojo_services_into_isolated_world_;
   std::unique_ptr<HeadlessTabSocketImpl> headless_tab_socket_;
 
   HeadlessBrowserContextImpl* browser_context_;      // Not owned.
   // TODO(alexclarke): With OOPIF there may be more than one renderer, we need
   // to fix this. See crbug.com/715924
   content::RenderProcessHost* render_process_host_;  // Not owned.
 
   using ObserverMap =
       std::unordered_map<HeadlessWebContents::Observer*,
                          std::unique_ptr<WebContentsObserverAdapter>>;
   ObserverMap observer_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_