Windows install_static refactor.

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2012 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/common/chrome_paths_internal.h"
-#include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/app_registration_data.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/uninstall_metrics.h"
 #include "chrome/installer/util/updating_app_registration_data.h"
@@ skipping 194 matching lines @@
 
   base::string16 ap_value;
   // If we fail to read the ap key, send up "&ap=" anyway to indicate
   // that this was probably a stable channel release.
   client_state_key.ReadValue(google_update::kRegApField, &ap_value);
   result.append(google_update::kRegApField);
   result.append(L"=");
   result.append(ap_value);
 
   // Crash client id.
-  base::string16 crash_dump_location;
-  if (install_static::GetDefaultCrashDumpLocation(&crash_dump_location)) {
-    base::FilePath crash_dir = base::FilePath(crash_dump_location);
+  // While it would be convenient to use the path service to get
+  // chrome::DIR_CRASH_DUMPS, that points to the dump location for the installer
+  // rather than for the browser. For per-user installs they are the same, yet
+  // for system-level installs the installer uses the system temp directory (see
+  // setup/installer_crash_reporting.cc's ConfigureCrashReporting).
+  // TODO(grt): use install_static::GetDefaultCrashDumpLocation (with an option
+  // to suppress creating the directory) once setup.exe uses
+  // install_static::InstallDetails.
+  base::FilePath crash_dir;
+  if (chrome::GetDefaultUserDataDirectory(&crash_dir)) {
+    crash_dir = crash_dir.Append(FILE_PATH_LITERAL("Crashpad"));
     crashpad::UUID client_id;
     std::unique_ptr<crashpad::CrashReportDatabase> database(
         crashpad::CrashReportDatabase::InitializeWithoutCreating(crash_dir));
     if (database && database->GetSettings()->GetClientID(&client_id))
       result.append(L"&crash_client_id=").append(client_id.ToString16());
   }
 
   return result;
 }
 
@@ skipping 26 matching lines @@
       GetAppGuid());
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeDistribution::HasUserExperiments() {
   return true;
 }