Fix ASAN canary crashes.

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 "chrome/app/main_dll_loader_win.h"
 
 #include <windows.h>  // NOLINT
 #include <shlwapi.h>  // NOLINT
 #include <stddef.h>
 #include <userenv.h>  // NOLINT
@@ skipping 25 matching lines @@
 #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/metrics_constants_util_win.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/module_util_win.h"
 #include "chrome/installer/util/util_constants.h"
-#include "components/crash/content/app/crash_reporter_client.h"
-#include "components/crash/content/app/crashpad.h"
 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "content/public/common/content_switches.h"
 #include "sandbox/win/src/sandbox.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
 
 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
@@ skipping 159 matching lines @@
 #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 (crash_reporter::GetUploadsEnabled()) {
+    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;
@@ skipping 53 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }