win: Move Crashpad all into chrome.exe

components/crash/content/app/crashpad_win.cc

 // Copyright 2015 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 "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"
 #include "build/build_config.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "third_party/crashpad/crashpad/client/crashpad_info.h"
 
 namespace crash_reporter {
 namespace internal {
@@ skipping 13 matching lines @@
   const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   DCHECK_EQ(initial_client, browser_process);
 
   if (initial_client) {
     CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
     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);
     std::map<std::string, std::string> process_annotations;
     process_annotations["prod"] = base::UTF16ToUTF8(product_name);
     process_annotations["ver"] = base::UTF16ToUTF8(version);
     process_annotations["channel"] = base::UTF16ToUTF8(channel_name);
     if (!special_build.empty())
       process_annotations["special"] = base::UTF16ToUTF8(special_build);
 #if defined(ARCH_CPU_X86)
     process_annotations["plat"] = std::string("Win32");
 #elif defined(ARCH_CPU_X86_64)
     process_annotations["plat"] = std::string("Win64");
 #endif
 #if defined(GOOGLE_CHROME_BUILD)
     std::string url = "https://clients2.google.com/cr/report";
 #else
     std::string url;
 #endif
 
     std::vector<std::string> arguments;
 
     // 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");
     }
 
     result = g_crashpad_client.Get().StartHandler(
         exe_file, database_path, url, process_annotations, arguments, false);
 
     // If we're the browser, push the pipe name into the environment so child
     // processes can connect to it. If we inherited another crashpad_handler's
@@ skipping 110 matching lines @@
       reinterpret_cast<ExceptionHandlerRecord*>(start);
 
   CHECK(RtlDeleteFunctionTable(&record->runtime_function));
 }
 #endif  // ARCH_CPU_X86_64
 
 }  // extern "C"
 
 }  // namespace internal
 }  // namespace crash_reporter