Revert of Make --headless flag work on Mac

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 "base/command_line.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/common/chrome_switches.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 "chrome/app/mash/mash_runner.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
 #include "services/service_manager/runner/common/client_util.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "chrome/app/chrome_main_mac.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/initialize_from_primary_module.h"
 #include "chrome/install_static/install_details.h"
 
 #define DLLEXPORT __declspec(dllexport)
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
@@ skipping 51 matching lines @@
   params.argc = argc;
   params.argv = argv;
 #endif
 
 #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) || defined(OS_MACOSX)
-  if (command_line->HasSwitch(switches::kHeadless)) {
-#if defined(OS_MACOSX)
-    SetUpBundleOverrides();
-#endif
+#if defined(OS_LINUX)
+  if (command_line->HasSwitch(switches::kHeadless))
     return headless::HeadlessShellMain(argc, argv);
-  }
-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
+#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(switches::kMash))
       return MashMain();
     WaitForMashDebuggerIfNecessary();
     if (service_manager::ServiceManagerIsRemote())
       params.env_mode = aura::Env::Mode::MUS;
   }
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 
   int rv = content::ContentMain(params);
 
 #if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
 
   return rv;
 }