Adding error handlers to setup.exe

chrome/app/client_util.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>
 #include <shlwapi.h>
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.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/util_constants.h"
 #include "components/crash/content/app/breakpad_win.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "components/metrics/client_info.h"
-#include "content/public/app/startup_helper_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)();
 
 base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
@@ skipping 256 matching lines @@
 #if defined(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 {
             bool is_per_user_install =
                 g_chrome_crash_client.Get().GetIsPerUserInstall(
                     base::FilePath(exe_path));
             if (g_chrome_crash_client.Get().GetShouldDumpLargerDumps(
-                    is_per_user_install)){
+                    is_per_user_install)) {
               minidump_type = kasko::api::LARGER_DUMP_TYPE;
             }
           }
 
           kasko_client_.reset(
               new KaskoClient(chrome_watcher_client_.get(), minidump_type));
 #endif  // KASKO
         }
       }
     }
@@ skipping 35 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }