Make the NaCl windows 64 bit binaries not depend on chrome targets.

content/app/content_main.cc

 // Copyright (c) 2011 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 "content/app/content_main.h"
 
 #include "base/at_exit.h"
-#include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_table.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "content/app/content_main_delegate.h"
+#include "content/app/startup_helper_win.h"
 #include "content/common/content_constants.h"
 #include "content/common/content_paths.h"
 #include "content/common/content_switches.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/set_process_title.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_paths.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlapp.h>
-#include <new.h>
 #include <malloc.h>
 #elif defined(OS_MACOSX)
 #include "base/mach_ipc_mac.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/browser/mach_broker_mac.h"
 #endif // OS_WIN
 
 #if defined(OS_POSIX)
 #include <signal.h>
 
@@ skipping 24 matching lines @@
 extern int ZygoteMain(const MainFunctionParams&,
                       ZygoteForkDelegate* forkdelegate);
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 
 static CAppModule _Module;
 
-#pragma optimize("", off)
-// Handlers for invalid parameter and pure call. They generate a breakpoint to
-// tell breakpad that it needs to dump the process.
-void InvalidParameter(const wchar_t* expression, const wchar_t* function,
-                      const wchar_t* file, unsigned int line,
-                      uintptr_t reserved) {
-  __debugbreak();
-  _exit(1);
-}
-
-void PureCall() {
-  __debugbreak();
-  _exit(1);
-}
-#pragma optimize("", on)
-
-// Register the invalid param handler and pure call handler to be able to
-// notify breakpad when it happens.
-void RegisterInvalidParamHandler() {
-  _set_invalid_parameter_handler(InvalidParameter);
-  _set_purecall_handler(PureCall);
-  // Also enable the new handler for malloc() based failures.
-  _set_new_mode(1);
-}
-
 #elif defined(OS_MACOSX)
 
 // Completes the Mach IPC handshake by sending this process' task port to the
 // parent process.  The parent is listening on the Mach port given by
 // |GetMachPortName()|.  The task port is used by the parent to get CPU/memory
 // stats to display in the task manager.
 void SendTaskPortToParentProcess() {
   const mach_msg_timeout_t kTimeoutMs = 100;
   const int32_t kMessageId = 0;
   std::string mach_port_name = MachBroker::GetMachPortName();
@@ skipping 33 matching lines @@
   for (unsigned i = 0; i < arraysize(signals_to_reset); i++) {
     CHECK(0 == sigaction(signals_to_reset[i], &sigact, NULL));
   }
 
   // Always ignore SIGPIPE.  We check the return value of write().
   CHECK(signal(SIGPIPE, SIG_IGN) != SIG_ERR);
 }
 
 #endif  // OS_POSIX
 
-void SetupCRT(const CommandLine& command_line) {
-#if defined(OS_WIN)
-#if defined(_CRTDBG_MAP_ALLOC)
-  _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-  _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
-#else
-  if (!command_line.HasSwitch(switches::kDisableBreakpad)) {
-    _CrtSetReportMode(_CRT_ASSERT, 0);
-  }
-#endif
-#endif
-}
-
 void CommonSubprocessInit(const std::string& process_type) {
 #if defined(OS_WIN)
   // HACK: Let Windows know that we have started.  This is needed to suppress
   // the IDC_APPSTARTING cursor from being displayed for a prolonged period
   // while a subprocess is starting.
   PostThreadMessage(GetCurrentThreadId(), WM_NULL, 0, 0);
   MSG msg;
   PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
 #endif
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 132 matching lines @@
 namespace content {
 
 #if defined(OS_WIN)
 int ContentMain(HINSTANCE instance,
                 sandbox::SandboxInterfaceInfo* sandbox_info,
                 ContentMainDelegate* delegate) {
   // argc/argv are ignored on Windows; see command_line.h for details.
   int argc = 0;
   char** argv = NULL;
 
-  RegisterInvalidParamHandler();
+  content::RegisterInvalidParamHandler();
   _Module.Init(NULL, static_cast<HINSTANCE>(instance));
 #else
 int ContentMain(int argc,
                 char** argv,
                 ContentMainDelegate* delegate) {
   // NOTE(willchan): One might ask why this call is done here rather than in
   // process_util_linux.cc with the definition of
   // EnableTerminationOnOutOfMemory().  That's because base shouldn't have a
   // dependency on TCMalloc.  Really, we ought to have our allocator shim code
   // implement this EnableTerminationOnOutOfMemory() function.  Whateverz.  This
@@ skipping 52 matching lines @@
       process_type == switches::kUtilityProcess ||
       process_type == switches::kWorkerProcess ||
       (delegate && delegate->ProcessRegistersWithSystemProcess(process_type))) {
     base::SystemMonitor::AllocateSystemIOPorts();
   }
 
   if (!process_type.empty() &&
       (!delegate || delegate->ShouldSendMachPort(process_type))) {
     SendTaskPortToParentProcess();
   }
+#elif defined(OS_WIN)
+  content::SetupCRT(command_line);
 #endif
 
 #if defined(OS_POSIX)
   if (!process_type.empty()) {
     // When you hit Ctrl-C in a terminal running the browser
     // process, a SIGINT is delivered to the entire process group.
     // When debugging the browser process via gdb, gdb catches the
     // SIGINT for the browser process (and dumps you back to the gdb
     // console) but doesn't for the child processes, killing them.
     // The fix is to have child processes ignore SIGINT; they'll die
     // on their own when the browser process goes away.
     //
     // Note that we *can't* rely on BeingDebugged to catch this case because we
     // are the child process, which is not being debugged.
     // TODO(evanm): move this to some shared subprocess-init function.
     if (!base::debug::BeingDebugged())
       signal(SIGINT, SIG_IGN);
   }
 #endif
 
-  SetupCRT(command_line);
-
 #if defined(USE_NSS)
   crypto::EarlySetupForNSSInit();
 #endif
 
   ui::RegisterPathProvider();
   content::RegisterPathProvider();
 
   CHECK(icu_util::Initialize());
 
   base::ProcessId browser_pid = base::GetCurrentProcId();
@@ skipping 61 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif  // OS_WIN
 
   return exit_code;
 }
 
 }  // namespace content