Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1126)

Unified Diff: chrome/app/main_dll_loader_win.cc

Issue 2256723002: Fix SyzyASAN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/main_dll_loader_win.cc
diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc
index 3fd6226eaad4f573fea84ac11d828c68c58c1a68..96d321377b152392433a45474cdcc7b541827a92 100644
--- a/chrome/app/main_dll_loader_win.cc
+++ b/chrome/app/main_dll_loader_win.cc
@@ -31,7 +31,6 @@
#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"
@@ -212,55 +211,12 @@ class ChromeDllLoader : public MainDllLoader {
private:
std::unique_ptr<ChromeWatcherClient> chrome_watcher_client_;
-#if BUILDFLAG(ENABLE_KASKO)
- std::unique_ptr<KaskoClient> kasko_client_;
-#endif
};
void ChromeDllLoader::OnBeforeLaunch(const std::string& process_type,
const base::FilePath& dll_path) {
if (process_type.empty()) {
RecordDidRun(dll_path);
-
- typedef bool (*GetUploadsEnabledFunction)(void);
- static GetUploadsEnabledFunction get_uploads_enabled = nullptr;
- if (!get_uploads_enabled) {
- get_uploads_enabled = reinterpret_cast<GetUploadsEnabledFunction>(
- GetProcAddress(GetModuleHandle(chrome::kChromeElfDllName),
- "GetUploadsEnabled"));
- CHECK(get_uploads_enabled);
- }
-
- // Launch the watcher process if stats collection consent has been granted.
- if (get_uploads_enabled()) {
- base::FilePath exe_path;
- if (PathService::Get(base::FILE_EXE, &exe_path)) {
- chrome_watcher_client_.reset(new ChromeWatcherClient(
- base::Bind(&GenerateChromeWatcherCommandLine, exe_path)));
- if (chrome_watcher_client_->LaunchWatcher()) {
-#if BUILDFLAG(ENABLE_KASKO)
- kasko::api::MinidumpType minidump_type = kasko::api::SMALL_DUMP_TYPE;
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kFullMemoryCrashReport)) {
- minidump_type = kasko::api::FULL_DUMP_TYPE;
- } else {
- // TODO(scottmg): Point this at the common global one when it's
- // moved back into the .exe. http://crbug.com/546288.
- ChromeCrashReporterClient chrome_crash_client;
- bool is_per_user_install = chrome_crash_client.GetIsPerUserInstall(
- exe_path.value());
- if (chrome_crash_client.GetShouldDumpLargerDumps(
- is_per_user_install)) {
- minidump_type = kasko::api::LARGER_DUMP_TYPE;
- }
- }
-
- kasko_client_.reset(
- new KaskoClient(chrome_watcher_client_.get(), minidump_type));
-#endif // BUILDFLAG(ENABLE_KASKO)
- }
- }
- }
} else {
// Set non-browser processes up to be killed by the system after the browser
// goes away. The browser uses the default shutdown order, which is 0x280.
@@ -280,9 +236,6 @@ int ChromeDllLoader::OnBeforeExit(int return_code,
ClearDidRun(dll_path);
}
-#if BUILDFLAG(ENABLE_KASKO)
- kasko_client_.reset();
-#endif
chrome_watcher_client_.reset();
return return_code;
« chrome/BUILD.gn ('K') | « chrome/app/kasko_client.cc ('k') | chrome_elf/chrome_elf_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698