win: Move Crashpad all into chrome.exe

chrome/app/main_dll_loader_win.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 <windows.h>  // NOLINT
 #include <shlwapi.h>  // NOLINT
 
 #include "chrome/app/main_dll_loader_win.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/metro.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "chrome/app/chrome_crash_reporter_client.h"
 #include "chrome/app/chrome_watcher_client_win.h"
 #include "chrome/app/chrome_watcher_command_line_win.h"
 #include "chrome/app/file_pre_reader_win.h"
 #include "chrome/app/kasko_client.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
@@ skipping 124 matching lines @@
     HMODULE metro_dll = Load(&version, &file);
     if (!metro_dll)
       return chrome::RESULT_CODE_MISSING_DATA;
 
     InitMetro chrome_metro_main =
         reinterpret_cast<InitMetro>(::GetProcAddress(metro_dll, "InitMetro"));
     return chrome_metro_main();
   }
 
   if (process_type_ == "watcher") {
-    chrome::RegisterPathProvider();
-
     base::win::ScopedHandle parent_process;
     base::win::ScopedHandle on_initialized_event;
     DWORD main_thread_id = 0;
     if (!InterpretChromeWatcherCommandLine(cmd_line, &parent_process,
                                            &main_thread_id,
                                            &on_initialized_event)) {
       return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
     }
 
     base::FilePath default_user_data_directory;
@@ skipping 23 matching lines @@
             ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
     return watcher_main(chrome::kBrowserExitCodesRegistryPath,
                         parent_process.Take(), main_thread_id,
                         on_initialized_event.Take(),
                         watcher_data_directory.value().c_str(),
                         message_window_name.c_str(), channel_name.c_str());
   }
 
   // Initialize the sandbox services.
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);

[cpu_(ooo_6.6-7.5), 2015/12/02 19:12:26]

this is what I was talking about sharing c++ across modules.

[scottmg, 2015/12/02 21:57:29]

Thanks, copied something like that.

 
   dll_ = Load(&version, &file);
   if (!dll_)
     return chrome::RESULT_CODE_MISSING_DATA;
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
   env->SetVar(chrome::kChromeVersionEnvVar, base::WideToUTF8(version));
 
   OnBeforeLaunch(process_type_, file);
   DLL_MAIN chrome_main =
@@ skipping 83 matching lines @@
     ::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY);
   }
 }
 
 int ChromeDllLoader::OnBeforeExit(int return_code,
                                   const base::FilePath& dll_path) {
   // NORMAL_EXIT_CANCEL is used for experiments when the user cancels
   // so we need to reset the did_run signal so omaha does not count
   // this run as active usage.
   if (chrome::RESULT_CODE_NORMAL_EXIT_CANCEL == return_code) {
     ClearDidRun(dll_path);

[cpu_(ooo_6.6-7.5), 2015/12/02 19:12:26]

can you place a breakpoint here? we want to make sure we only do this for the
process that loads chrome.dll, for browser.

[scottmg, 2015/12/02 21:57:30]

This function gets called for most processes (other than the renderers which get
otherwise terminated). But it doesn't end up hitting the ClearDidRun code
because RESULT_CODE_NORMAL_EXIT_CANCEL is not returned.

   }
 
 #if defined(KASKO)
   kasko_client_.reset();
 #endif  // KASKO
   chrome_watcher_client_.reset();
 
   return return_code;
 }
 
 //=============================================================================
 
 class ChromiumDllLoader : public MainDllLoader {
  protected:
   void OnBeforeLaunch(const std::string& process_type,
                       const base::FilePath& dll_path) override {}
   int OnBeforeExit(int return_code, const base::FilePath& dll_path) override {
     return return_code;
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }