Revert of Implement a runtime headless mode for Linux (patchset #20 id:380001 of https://codereview.chromium.org/1991953002/ )

Reason for revert:
Unexpectedly added a couple of new static initializers: https://uberchromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/29946

Original issue's description:
> Implement a runtime headless mode for Linux
>
> This patch implements a runtime headless mode (i.e., a
> --headless command line switch) that makes it possible to
> use a regular Chrome binary as a headless. When the binary
> is launched with this switch, the main entrypoint calls
> into the Headless Shell entrypoint, effectively starting
> that shell instead of Chrome.
>
> To make this possible we must remove the dependency from
> Headless to Ozone, because Ozone is a build-time feature
> which is generally not enabled for regular Chrome builds.
> In practice this means implementing a new headless-specific
> WindowTreeHost and modifying various graphics and input
> entrypoints to do something appropriate in headless mode.
>
> Since many of the modifications are in platform-specific
> code, this initial patch only adds headless support in Linux.
> Other platforms will be added later.
>
> Design doc: https://docs.google.com/document/d/1aIJUzQr3eougZQp90bp4mqGr5gY6hdUice8UPa-Ys90/edit#
>
> BUG=612904
> CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
>
> Committed: https://crrev.com/eb0f3b0218478f30858dfa2078cb350ea259701f
> Cr-Commit-Position: refs/heads/master@{#438152}

TBR=jochen@chromium.org,eseckler@chromium.org,sky@chromium.org,zmo@chromium.org,vmiura@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=612904

Review-Url: https://codereview.chromium.org/2570873002
Cr-Commit-Position: refs/heads/master@{#438177}

Author: skyostil

chrome/BUILD.gn

@@ -239,9 +239,6 @@ if (!is_android && !is_mac) {
         # Needed to use the master_preferences functions
         "//chrome/installer/util:with_no_strings",
         "//content/public/app:both",
-
-        # For headless mode.
-        "//headless:headless_shell_lib",
       ]
       if (enable_plugins && enable_pdf) {
         deps += [ "//pdf" ]

chrome/app/DEPS

@@ -29,7 +29,6 @@ include_rules = [
   "+content/public/app",
   "+content/public/browser/browser_main_runner.h",
   "+extensions/common/constants.h",
-  "+headless/public",  # For headless mode.
   "+native_client/src/trusted/service_runtime/osx",
   "+remoting/client/plugin",
   "+sandbox",

chrome/app/chrome_main.cc

@@ -5,16 +5,13 @@
 #include <stdint.h>
 
 #include "build/build_config.h"
-#include "base/command_line.h"
 #include "base/time/time.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/common/features.h"
 #include "content/public/app/content_main.h"
-#include "content/public/common/content_switches.h"
-#include "headless/public/headless_shell.h"
-#include "ui/gfx/switches.h"
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+#include "base/command_line.h"
 #include "chrome/app/mash/mash_runner.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
@@ -85,22 +82,17 @@ int ChromeMain(int argc, const char** argv) {
   params.argv = argv;
 #endif
 
+#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 #if !defined(OS_WIN)
   base::CommandLine::Init(params.argc, params.argv);
-  const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess());
-  ALLOW_UNUSED_LOCAL(command_line);
 #endif
 
-#if defined(OS_LINUX)
-  if (command_line->HasSwitch(switches::kHeadless))
-    return headless::HeadlessShellMain(argc, argv);
-#endif  // defined(OS_LINUX)
-
-#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   version_info::Channel channel = chrome::GetChannel();
   if (channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::UNKNOWN) {
-    if (command_line->HasSwitch("mash"))
+    const base::CommandLine& command_line =
+        *base::CommandLine::ForCurrentProcess();
+    if (command_line.HasSwitch("mash"))
       return MashMain();
     WaitForMashDebuggerIfNecessary();
   }

content/browser/browser_main_loop.cc

@@ -105,7 +105,6 @@
 #include "skia/ext/skia_memory_dump_provider.h"
 #include "sql/sql_memory_dump_provider.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/gfx/switches.h"
 
 #if defined(USE_AURA) || defined(OS_MACOSX)
 #include "content/browser/compositor/image_transport_factory.h"
@@ -464,8 +463,6 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver {
   }
 
   void OnGpuInfoUpdate() override {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless))
-      return;
     gpu::GPUInfo gpu_info = gpu_data_manager_->GetGPUInfo();
     if (!ui::XVisualManager::GetInstance()->OnGPUInfoChanged(
             gpu_info.software_rendering ||
@@ -1572,8 +1569,7 @@ bool BrowserMainLoop::InitializeToolkit() {
 #if defined(USE_AURA)
 
 #if defined(USE_X11)
-  if (!parsed_command_line_.HasSwitch(switches::kHeadless) &&
-      !gfx::GetXDisplay()) {
+  if (!gfx::GetXDisplay()) {
     LOG(ERROR) << "Unable to open X display.";
     return false;
   }

content/browser/compositor/gpu_process_transport_factory.cc

@@ -55,7 +55,6 @@
 #include "ui/compositor/layer.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/switches.h"
 
 #if defined(USE_AURA)
 #include "content/browser/compositor/mus_browser_compositor_output_surface.h"
@@ -197,10 +196,6 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
 std::unique_ptr<cc::SoftwareOutputDevice>
 GpuProcessTransportFactory::CreateSoftwareOutputDevice(
     ui::Compositor* compositor) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kHeadless))
-    return base::WrapUnique(new cc::SoftwareOutputDevice);
-
 #if defined(USE_AURA)
   if (service_manager::ServiceManagerIsRemote()) {
     NOTREACHED();
@@ -265,10 +260,6 @@ CreateOverlayCandidateValidator(gfx::AcceleratedWidget widget) {
 }
 
 static bool ShouldCreateGpuCompositorFrameSink(ui::Compositor* compositor) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kHeadless))
-    return false;
-
 #if defined(OS_CHROMEOS)
   // Software fallback does not happen on Chrome OS.
   return true;

content/browser/gpu/gpu_process_host.cc

@@ -69,7 +69,6 @@
 #include "services/service_manager/runner/common/client_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/latency_info.h"
-#include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_ANDROID)
@@ -136,7 +135,6 @@ static const char* const kSwitchNames[] = {
     switches::kGpuSandboxAllowSysVShm,
     switches::kGpuSandboxFailuresFatal,
     switches::kGpuSandboxStartEarly,
-    switches::kHeadless,
     switches::kLoggingLevel,
     switches::kEnableLowEndDeviceMode,
     switches::kDisableLowEndDeviceMode,

content/browser/zygote_host/zygote_communication_linux.cc

@@ -23,7 +23,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "ui/display/display_switches.h"
-#include "ui/gfx/switches.h"
 
 namespace content {
 
@@ -253,9 +252,6 @@ void ZygoteCommunication::Init() {
       switches::kDisableSeccompFilterSandbox,
       switches::kEnableHeapProfiling,
       switches::kEnableLogging,  // Support, e.g., --enable-logging=stderr.
-      // Need to tell the zygote that it is headless so that we don't try to use
-      // the wrong type of main delegate.
-      switches::kHeadless,
       // Zygote process needs to know what resources to have loaded when it
       // becomes a renderer process.
       switches::kForceDeviceScaleFactor, switches::kLoggingLevel,

content/gpu/gpu_main.cc

@@ -40,7 +40,6 @@
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "ui/events/platform/platform_event_source.h"
-#include "ui/gfx/switches.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
@@ -201,39 +200,35 @@ int GpuMain(const MainFunctionParams& parameters) {
   // TODO(ericrk): Revisit this once we assess its impact on crbug.com/662802
   // and crbug.com/609252.
   std::unique_ptr<base::MessageLoop> main_message_loop;
-  if (command_line.HasSwitch(switches::kHeadless)) {
-    main_message_loop.reset(
-        new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
-  } else {
+
 #if defined(OS_WIN)
-    // OK to use default non-UI message loop because all GPU windows run on
-    // dedicated thread.
-    main_message_loop.reset(
-        new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
+  // OK to use default non-UI message loop because all GPU windows run on
+  // dedicated thread.
+  main_message_loop.reset(
+      new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
 #elif defined(USE_X11)
-    // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
-    // and https://crbug.com/326995.
-    main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
-    std::unique_ptr<ui::PlatformEventSource> event_source =
-        ui::PlatformEventSource::CreateDefault();
+  // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
+  // and https://crbug.com/326995.
+  main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  std::unique_ptr<ui::PlatformEventSource> event_source =
+      ui::PlatformEventSource::CreateDefault();
 #elif defined(USE_OZONE) && defined(OZONE_X11)
-    // If we might be running Ozone X11 we need a UI loop to grab Expose events.
-    // See GLSurfaceGLX and https://crbug.com/326995.
-    main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  // If we might be running Ozone X11 we need a UI loop to grab Expose events.
+  // See GLSurfaceGLX and https://crbug.com/326995.
+  main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
 #elif defined(USE_OZONE)
-    main_message_loop.reset(
-        new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
+  main_message_loop.reset(
+      new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
 #elif defined(OS_LINUX)
 #error "Unsupported Linux platform."
 #elif defined(OS_MACOSX)
-    // This is necessary for CoreAnimation layers hosted in the GPU process to
-    // be drawn. See http://crbug.com/312462.
-    std::unique_ptr<base::MessagePump> pump(new base::MessagePumpCFRunLoop());
-    main_message_loop.reset(new base::MessageLoop(std::move(pump)));
+  // This is necessary for CoreAnimation layers hosted in the GPU process to be
+  // drawn. See http://crbug.com/312462.
+  std::unique_ptr<base::MessagePump> pump(new base::MessagePumpCFRunLoop());
+  main_message_loop.reset(new base::MessageLoop(std::move(pump)));
 #else
-    main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
+  main_message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
 #endif
-  }
 
   base::PlatformThread::SetName("CrGpuMain");
 

gpu/ipc/service/gpu_init.cc

@@ -17,7 +17,6 @@
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "gpu/ipc/service/switches.h"
-#include "ui/gfx/switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
@@ -128,7 +127,6 @@ bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) {
   // to run slowly in that case.
   bool enable_watchdog =
       !command_line.HasSwitch(switches::kDisableGpuWatchdog) &&
-      !command_line.HasSwitch(switches::kHeadless) &&
       !RunningOnValgrind();
 
   // Disable the watchdog in debug builds because they tend to only be run by

headless/BUILD.gn

@@ -167,8 +167,6 @@ static_library("headless_lib") {
               "lib/browser/headless_devtools_client_impl.h",
               "lib/browser/headless_devtools_manager_delegate.cc",
               "lib/browser/headless_devtools_manager_delegate.h",
-              "lib/browser/headless_platform_event_source.cc",
-              "lib/browser/headless_platform_event_source.h",
               "lib/browser/headless_screen.cc",
               "lib/browser/headless_screen.h",
               "lib/browser/headless_url_request_context_getter.cc",
@@ -177,12 +175,14 @@ static_library("headless_lib") {
               "lib/browser/headless_web_contents_impl.h",
               "lib/browser/headless_window_parenting_client.cc",
               "lib/browser/headless_window_parenting_client.h",
-              "lib/browser/headless_window_tree_host.cc",
-              "lib/browser/headless_window_tree_host.h",
               "lib/headless_content_client.cc",
               "lib/headless_content_client.h",
               "lib/headless_content_main_delegate.cc",
               "lib/headless_content_main_delegate.h",
+              "lib/renderer/headless_content_renderer_client.cc",
+              "lib/renderer/headless_content_renderer_client.h",
+              "lib/utility/headless_content_utility_client.cc",
+              "lib/utility/headless_content_utility_client.h",
               "public/headless_browser.cc",
               "public/headless_browser.h",
               "public/headless_browser_context.h",
@@ -232,23 +232,22 @@ static_library("headless_lib") {
     "//components/security_state/core",
     "//content/public/app:both",
     "//content/public/browser",
+    "//content/public/child",
     "//content/public/common",
     "//content/public/common:service_names",
+    "//content/public/renderer",
+    "//content/public/utility",
     "//net",
     "//services/service_manager/public/cpp",
     "//third_party/mesa:osmesa",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/display",
-    "//ui/events/devices",
+    "//ui/ozone",
     "//url",
   ]
 
-  if (use_ozone) {
-    deps += [ "//ui/ozone" ]
-  }
-
   configs += [ ":headless_implementation" ]
 }
 

headless/DEPS

@@ -1,15 +1,10 @@
 include_rules = [
-  "+content/public/app",
-  "+content/public/browser",
-  "+content/public/common",
-  "+content/public/test",
+  "+content/public",
   "+mojo/public",
   "+net",
   "+ui/base",
   "+ui/base/resource",
   "+ui/display",
-  "+ui/events/devices",
-  "+ui/events/platform",
   "+ui/gfx",
   "+ui/gfx/geometry",
   "+ui/gl",

headless/README.md

@@ -69,7 +69,6 @@ web pages. Its main classes are:
 
 ## Documentation
 
-* [Runtime headless mode for Chrome](https://docs.google.com/document/d/1aIJUzQr3eougZQp90bp4mqGr5gY6hdUice8UPa-Ys90/edit#)
 * [Virtual Time in Blink](https://docs.google.com/document/d/1y9kdt_zezt7pbey6uzvt1dgklwc1ob_vy4nzo1zbqmo/edit#heading=h.tn3gd1y9ifml)
 * [Headless Chrome architecture](https://docs.google.com/document/d/11zIkKkLBocofGgoTeeyibB2TZ_k7nR78v7kNelCatUE/edit)
 * [Headless Chrome C++ DevTools API](https://docs.google.com/document/d/1rlqcp8nk-ZQvldNJWdbaMbwfDbJoOXvahPCDoPGOwhQ/edit#heading=h.ng2bxb15li9a)

headless/lib/browser/headless_browser_impl.cc

@@ -19,10 +19,9 @@
 #include "headless/lib/browser/headless_browser_main_parts.h"
 #include "headless/lib/browser/headless_web_contents_impl.h"
 #include "headless/lib/browser/headless_window_parenting_client.h"
-#include "headless/lib/browser/headless_window_tree_host.h"
 #include "headless/lib/headless_content_main_delegate.h"
 #include "ui/aura/env.h"
-#include "ui/events/devices/device_data_manager.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace headless {
@@ -120,10 +119,8 @@ void HeadlessBrowserImpl::set_browser_main_parts(
 
 void HeadlessBrowserImpl::RunOnStartCallback() {
   DCHECK(aura::Env::GetInstance());
-  ui::DeviceDataManager::CreateInstance();
-
   window_tree_host_.reset(
-      new HeadlessWindowTreeHost(gfx::Rect(options()->window_size)));
+      aura::WindowTreeHost::Create(gfx::Rect(options()->window_size)));
   window_tree_host_->InitHost();
 
   window_parenting_client_.reset(

headless/lib/browser/headless_platform_event_source.cc

@@ -26,6 +26,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/origin_util.h"
+#include "content/public/renderer/render_frame.h"
 #include "headless/lib/browser/headless_browser_context_impl.h"
 #include "headless/lib/browser/headless_browser_impl.h"
 #include "headless/lib/browser/headless_browser_main_parts.h"