Revert of Implement a runtime headless mode for Linux

chrome/app/chrome_main.cc

 // Copyright (c) 2012 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 <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"
 #endif
 
 #if defined(OS_WIN)
 #include "base/debug/dump_without_crashing.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/install_static/install_details.h"
@@ skipping 50 matching lines @@
 
   // Verify that chrome_elf and this module (chrome.dll and chrome_child.dll)
   // have the same version.
   if (install_static::InstallDetails::Get().VersionMismatch())
     base::debug::DumpWithoutCrashing();
 #else
   params.argc = argc;
   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();
   }
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 
   int rv = content::ContentMain(params);
 
 #if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
 
   return rv;
 }