Add the crash client ID to the uninstall URL params.

chrome/app/chrome_crash_reporter_client.cc

 // Copyright 2013 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 "chrome/app/chrome_crash_reporter_client.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #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"
 
 #if defined(OS_WIN)
 #include <windows.h>
 
 #include "base/file_version_info.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/install_util.h"
@@ skipping 243 matching lines @@
 }
 
 base::FilePath ChromeCrashReporterClient::GetReporterLogFilename() {
   return base::FilePath(CrashUploadList::kReporterLogFilename);
 }
 #endif
 
 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

[scottmg, 2016/01/08 20:16:09]

This should probably be moved/duplicated to GetDefaultCrashDumpLocation().

[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.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string alternate_crash_dump_location;
   if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
     base::FilePath crash_dumps_dir_path =
         base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
     PathService::Override(chrome::DIR_CRASH_DUMPS, crash_dumps_dir_path);
   }
@@ skipping 46 matching lines @@
 #endif
 
 bool ChromeCrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return process_type == switches::kRendererProcess ||
          process_type == switches::kPluginProcess ||
          process_type == switches::kPpapiPluginProcess ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kGpuProcess;
 }