Add chrome_crash_reporter_client_win.cc to the source file list for chrome_elf

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 <memory>
 
 #include "base/environment.h"
 #include "base/lazy_instance.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 "components/crash/content/app/crash_switches.h"
 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "third_party/crashpad/crashpad/client/crashpad_info.h"
 #include "third_party/crashpad/crashpad/client/simulate_crash_win.h"
 
 namespace crash_reporter {
 namespace internal {
 
 namespace {
 
 base::LazyInstance<crashpad::CrashpadClient>::Leaky g_crashpad_client =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 void GetPlatformCrashpadAnnotations(
     std::map<std::string, std::string>* annotations) {
   CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
-  base::FilePath exe_file;
-  CHECK(PathService::Get(base::FILE_EXE, &exe_file));
+  wchar_t exe_file[MAX_PATH] = {};
+  CHECK(::GetModuleFileName(NULL, exe_file, arraysize(exe_file)));
   base::string16 product_name, version, special_build, channel_name;
   crash_reporter_client->GetProductNameAndVersion(
-      exe_file.value(), &product_name, &version, &special_build,
-      &channel_name);
+      exe_file, &product_name, &version, &special_build, &channel_name);
   (*annotations)["prod"] = base::UTF16ToUTF8(product_name);
   (*annotations)["ver"] = base::UTF16ToUTF8(version);
   (*annotations)["channel"] = base::UTF16ToUTF8(channel_name);
   if (!special_build.empty())
     (*annotations)["special"] = base::UTF16ToUTF8(special_build);
 #if defined(ARCH_CPU_X86)
   (*annotations)["plat"] = std::string("Win32");
 #elif defined(ARCH_CPU_X86_64)
   (*annotations)["plat"] = std::string("Win64");
 #endif
 }
 
 base::FilePath PlatformCrashpadInitialization(bool initial_client,
                                               bool browser_process,
                                               bool embedded_handler) {
   base::FilePath database_path;  // Only valid in the browser process.
-  bool result;
+  bool result = false;
 
   const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
   const char kServerUrlVar[] = "CHROME_CRASHPAD_SERVER_URL";
   std::unique_ptr<base::Environment> env(base::Environment::Create());
-
   if (initial_client) {
     CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
 
     base::string16 database_path_str;
     if (crash_reporter_client->GetCrashDumpLocation(&database_path_str))
       database_path = base::FilePath(database_path_str);
 
     std::map<std::string, std::string> process_annotations;
     GetPlatformCrashpadAnnotations(&process_annotations);
 
 #if defined(GOOGLE_CHROME_BUILD)
     std::string url = "https://clients2.google.com/cr/report";
 #else
     std::string url;
 #endif
 
     // Allow the crash server to be overridden for testing. If the variable
     // isn't present in the environment then the default URL will remain.
     env->GetVar(kServerUrlVar, &url);
 
-    base::FilePath exe_file;
-    CHECK(PathService::Get(base::FILE_EXE, &exe_file));
+    wchar_t exe_file_path[MAX_PATH] = {};
+    CHECK(::GetModuleFileName(NULL, exe_file_path, arraysize(exe_file_path)));
+
+    base::FilePath exe_file(exe_file_path);
 
     bool is_per_user_install =
         crash_reporter_client->GetIsPerUserInstall(exe_file.value());
     if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) {
       const uint32_t kIndirectMemoryLimit = 4 * 1024 * 1024;
       crashpad::CrashpadInfo::GetCrashpadInfo()
           ->set_gather_indirectly_referenced_memory(
               crashpad::TriState::kEnabled, kIndirectMemoryLimit);
     }
 
     // If the handler is embedded in the binary (e.g. chrome, setup), we
     // reinvoke it with --type=crashpad-handler. Otherwise, we use the
     // standalone crashpad_handler.exe (for tests, etc.).
     std::vector<std::string> arguments;
     if (embedded_handler) {
       arguments.push_back(std::string("--type=") + switches::kCrashpadHandler);
-
-      if (startup_metric_utils::GetPreReadOptions().use_prefetch_argument) {

[grt (UTC plus 2), 2016/06/10 14:20:01]

fdoray: PTAL

[fdoray, 2016/06/10 17:37:42]

The pre-read experiment is completed. Removing this code is on my TODO list so
lgtm!

-        // The prefetch argument added here has to be documented in
-        // chrome_switches.cc, below the kPrefetchArgument* constants. A
-        // constant can't be used here because crashpad can't depend on Chrome.
-        arguments.push_back("/prefetch:7");
-      }
+      // The prefetch argument added here has to be documented in
+      // chrome_switches.cc, below the kPrefetchArgument* constants. A
+      // constant can't be used here because crashpad can't depend on Chrome.
+      arguments.push_back("/prefetch:7");
     } else {
       base::FilePath exe_dir = exe_file.DirName();
       exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe"));
     }
-
     // TODO(scottmg): See https://crashpad.chromium.org/bug/23.
     arguments.push_back("--no-rate-limit");
 
     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
     // pipe name, we'll overwrite it here.
     env->SetVar(kPipeNameVar,
                 base::UTF16ToUTF8(g_crashpad_client.Get().GetHandlerIPCPipe()));
   } else {
     std::string pipe_name_utf8;
     result = env->GetVar(kPipeNameVar, &pipe_name_utf8);
     if (result) {
       result = g_crashpad_client.Get().SetHandlerIPCPipe(
           base::UTF8ToUTF16(pipe_name_utf8));
     }
   }
 
   if (result) {
     result = g_crashpad_client.Get().UseHandler();
   }
-
   return database_path;
 }
 
 // TODO(scottmg): http://crbug.com/546288 These exported functions are for
 // compatibility with how Breakpad worked, but it seems like there's no need to
 // do the CreateRemoteThread() dance with a minor extension of the Crashpad API
 // (to just pass the pid we want a dump for). We should add that and then modify
 // hang_crash_dump_win.cc to work in a more direct manner.
 
 // Used for dumping a process state when there is no crash.
@@ skipping 142 matching lines @@
 void __declspec(dllexport) __cdecl UnregisterNonABICompliantCodeRange(
     void* start) {
   ExceptionHandlerRecord* record =
       reinterpret_cast<ExceptionHandlerRecord*>(start);
 
   CHECK(RtlDeleteFunctionTable(&record->runtime_function));
 }
 #endif  // ARCH_CPU_X86_64
 
 }  // extern "C"