Chromium Code Reviews| 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 4cac4f1adafd9b8b6fa686567d72c3d9d488d7f1..aecde14d825f68e877395cf218cc9f4ef4ded355 100644 |
| --- a/chrome/app/chrome_crash_reporter_client.cc |
| +++ b/chrome/app/chrome_crash_reporter_client.cc |
| @@ -13,10 +13,10 @@ |
| #include "base/strings/utf_string_conversions.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" |
| @@ -283,17 +283,9 @@ bool ChromeCrashReporterClient::GetCrashDumpLocation( |
| // In order to be able to start crash handling very early, we do not rely on |
|
scottmg
2016/01/08 20:16:09
This should probably be moved/duplicated to GetDef
grt (UTC plus 2)
2016/01/13 19:03:56
Done.
|
| // 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. |