win: Move Crashpad all into chrome.exe

chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 128 matching lines @@
     g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ChromeContentPluginClient>
     g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
 #endif
 
 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
 base::LazyInstance<ChromeContentBrowserClient> g_chrome_content_browser_client =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
-#if defined(OS_POSIX) || defined(OS_WIN)
+#if defined(OS_POSIX)
 base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
 extern int NaClMain(const content::MainFunctionParams&);
 extern int ServiceProcessMain(const content::MainFunctionParams&);
 
 namespace {
 
 #if defined(OS_WIN)
@@ skipping 331 matching lines @@
 #if defined(OS_WIN)
   // Must do this before any other usage of command line!
   if (HasDeprecatedArguments(command_line.GetCommandLineString())) {
     *exit_code = 1;
     return true;
   }
 
   InstallHandleHooks();
 #endif
 
+#if !defined(OS_WIN)
+  // This is done earlier in chrome.exe on Windows.
   chrome::RegisterPathProvider();
+#endif
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
   nacl::RegisterPathProvider();
 #endif
 
   ContentSettingsPattern::SetNonWildcardDomainNonPortScheme(
       extensions::kExtensionScheme);
 
@@ skipping 146 matching lines @@
   }
 }
 #endif  // defined(OS_MACOSX)
 
 void ChromeMainDelegate::PreSandboxStartup() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
-#if defined(OS_POSIX) || defined(OS_WIN)
+#if defined(OS_POSIX)
   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
 #endif
 
 #if defined(OS_MACOSX)
   // On the Mac, the child executable lives at a predefined location within
   // the app bundle's versioned directory.
   PathService::Override(content::CHILD_PROCESS_EXE,
                         chrome::GetVersionedDirectory().
                         Append(chrome::kHelperProcessExecutablePath));
 
   InitMacCrashReporter(command_line, process_type);
 #endif
 
 #if defined(OS_WIN)
-  // TODO(scottmg): It would be nice to do this earlier to catch early crashes,
-  // perhaps as early as WinMain in chrome.exe. This would require some code
-  // restructuring to have paths and command lines set up, and also to handle
-  // having some of the code live in chrome.exe, while having the database be
-  // accessed by browser code in chrome.dll (to get a list of uploaded crashes
-  // for chrome://crashes).
-  crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
-#endif  // OS_WIN
-
-#if defined(OS_WIN)
   child_process_logging::Init();
 #endif
 #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
   // cpu_brand info.
   base::CPU cpu_info;
 #endif
 
   // Initialize the user data dir for any process type that needs it.
   if (chrome::ProcessNeedsProfileDir(process_type))
@@ skipping 287 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }