Index: components/crash/content/app/crashpad_win.cc |
diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc |
index 684366e88e5d81a0e363a9303cc76d9f60bf4921..7b41db6ded08bfc49454354e8e699e78a7db71e6 100644 |
--- a/components/crash/content/app/crashpad_win.cc |
+++ b/components/crash/content/app/crashpad_win.cc |
@@ -4,11 +4,11 @@ |
#include "components/crash/content/app/crashpad.h" |
+#include "base/base_paths_win.h" |
#include "base/environment.h" |
#include "base/lazy_instance.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/numerics/safe_conversions.h" |
-#include "base/path_service.h" |
#include "base/strings/string16.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -42,7 +42,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, |
crash_reporter_client->GetCrashDumpLocation(&database_path); |
base::FilePath exe_file; |
- CHECK(PathService::Get(base::FILE_EXE, &exe_file)); |
+ CHECK(GetFileExe(&exe_file)); |
base::string16 product_name, version, special_build, channel_name; |
crash_reporter_client->GetProductNameAndVersion( |
exe_file, &product_name, &version, &special_build, &channel_name); |
@@ -68,8 +68,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client, |
// In test binaries, use crashpad_handler directly. Otherwise, we launch |
// chrome.exe with --type=crashpad-handler. |
if (exe_file.BaseName().value() != FILE_PATH_LITERAL("chrome.exe")) { |
- base::FilePath exe_dir; |
- CHECK(PathService::Get(base::DIR_EXE, &exe_dir)); |
+ base::FilePath exe_dir = exe_file.DirName(); |
exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe")); |
} else { |
arguments.push_back("--type=crashpad-handler"); |