| Index: chrome/app/chrome_crash_reporter_client.cc
|
| diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
|
| index 392b21838999f9c7922a7cc0abc8ceb5e08b3499..8c77d940343343bbcf30c514fec8e23329db3e16 100644
|
| --- a/chrome/app/chrome_crash_reporter_client.cc
|
| +++ b/chrome/app/chrome_crash_reporter_client.cc
|
| @@ -14,10 +14,10 @@
|
| #include "build/build_config.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| +#include "chrome/common/chrome_paths_internal.h"
|
| #include "chrome/common/chrome_result_codes.h"
|
| #include "chrome/common/crash_keys.h"
|
| #include "chrome/common/env_vars.h"
|
| -#include "chrome/installer/util/browser_distribution.h"
|
| #include "chrome/installer/util/google_update_settings.h"
|
| #include "content/public/common/content_switches.h"
|
|
|
| @@ -281,20 +281,9 @@ base::FilePath ChromeCrashReporterClient::GetReporterLogFilename() {
|
| bool ChromeCrashReporterClient::GetCrashDumpLocation(
|
| base::FilePath* crash_dir) {
|
| #if defined(OS_WIN)
|
| - // In order to be able to start crash handling very early, we do not rely on
|
| - // chrome's PathService entries (for DIR_CRASH_DUMPS) being available on
|
| - // Windows. See https://crbug.com/564398.
|
| - base::FilePath result;
|
| - if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &result))
|
| - return false;
|
| - BrowserDistribution* dist = BrowserDistribution::GetDistribution();
|
| - result = result.Append(dist->GetInstallSubDir());
|
| // TODO(scottmg): Consider supporting --user-data-dir. See
|
| // https://crbug.com/565446.
|
| - result = result.Append(chrome::kUserDataDirname);
|
| - result = result.Append(FILE_PATH_LITERAL("Crashpad"));
|
| - *crash_dir = result;
|
| - return true;
|
| + return chrome::GetDefaultCrashDumpLocation(crash_dir);
|
| #else
|
| // By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
|
| // location to write breakpad crash dumps can be set.
|
|
|