Make Crashpad use the user data dir, rather than always default location

chrome/install_static/install_util.h

 // Copyright 2016 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 contains helper functions which provide information about the
 // current version of Chrome. This includes channel information, version
 // information etc. This functionality is provided by using functions in
 // kernel32 and advapi32. No other dependencies are allowed in this file.
 
 #ifndef CHROME_INSTALL_STATIC_INSTALL_UTIL_H_
 #define CHROME_INSTALL_STATIC_INSTALL_UTIL_H_
 
 #include <string>
 #include <vector>
 
+#include "chrome/install_static/install_details.h"

[grt (UTC plus 2), 2016/11/22 21:06:58]

is this needed?

[scottmg, 2016/11/22 21:59:57]

Done.

+
 namespace install_static {
 
 struct InstallConstants;
 
 enum class ProcessType {
   UNINITIALIZED,
   NON_BROWSER_PROCESS,
   BROWSER_PROCESS,
 };
 
 // Registry key to store the stats/crash sampling state of Chrome. If set to 1,
 // stats and crash reports will be uploaded in line with the user's consent,
 // otherwise, uploads will be disabled. It is used to sample clients, to reduce
 // server load for metics and crashes. This is controlled by the
 // MetricsReporting feature in chrome_metrics_services_manager_client.cc and is
 // written when metrics services are started up and when consent changes.
 extern const wchar_t kRegValueChromeStatsSample[];
 
 // TODO(ananta)
 // https://crbug.com/604923
 // Unify these constants with env_vars.h.
 extern const wchar_t kHeadless[];
 extern const wchar_t kShowRestart[];
 extern const wchar_t kRestartInfo[];
 extern const wchar_t kRtlLocale[];
 
 // TODO(ananta)
 // https://crbug.com/604923
 // Unify these constants with those defined in content_switches.h.
-extern const char kGpuProcess[];
-extern const char kPpapiPluginProcess[];
-extern const char kRendererProcess[];
-extern const char kUtilityProcess[];
-extern const char kProcessType[];
-extern const char kCrashpadHandler[];
+extern const wchar_t kCrashpadHandler[];
+extern const wchar_t kProcessType[];
+extern const wchar_t kUserDataDirSwitch[];
+extern const wchar_t kUtilityProcess[];
 
 // Returns true if Chrome is running at system level.
 bool IsSystemInstall();
 
 // Returns true if current installation of Chrome is a multi-install.
 bool IsMultiInstall();
 
 // Returns true if usage stats collecting is enabled for this user for the
 // current executable.
 bool GetCollectStatsConsent();
 
 // Returns true if the current executable is currently in the chosen sample that
 // will report stats and crashes.
 bool GetCollectStatsInSample();
 
 // Sets the registry value used for checking if Chrome is in the chosen sample
 // that will report stats and crashes. Returns true if writing was successful.
 bool SetCollectStatsInSample(bool in_sample);
 
+// Appends "[kCompanyPathName\]kProductPathName[install_suffix]" to |path|,
+// returning a reference to |path|.
+std::wstring& AppendChromeInstallSubDirectory(const InstallConstants& mode,
+                                              bool include_suffix,
+                                              std::wstring* path);
+
 // Returns true if if usage stats reporting is controlled by a mandatory
 // policy. |crash_reporting_enabled| determines whether it's enabled (true) or
 // disabled (false).
 bool ReportingIsEnforcedByPolicy(bool* crash_reporting_enabled);
 
 // Initializes |g_process_type| which stores whether or not the current
 // process is the main browser process.
 void InitializeProcessType();
 
 // Returns true if invoked in a Chrome process other than the main browser
 // process. False otherwise.
 bool IsNonBrowserProcess();
 
-// Populates |result| with the default User Data directory for the current
-// user.This may be overidden by a command line option.Returns false if all
-// attempts at locating a User Data directory fail
+// Populates |crash_dir| with the crash dump location, respecting modifications
+// to user-data-dir.
 // TODO(ananta)
 // http://crbug.com/604923
 // Unify this with the Browser Distribution code.
-bool GetDefaultUserDataDirectory(std::wstring* result);
-
-// Populates |crash_dir| with the default crash dump location regardless of
-// whether DIR_USER_DATA or DIR_CRASH_DUMPS has been overridden.
-// TODO(ananta)
-// http://crbug.com/604923
-// Unify this with the Browser Distribution code.
-bool GetDefaultCrashDumpLocation(std::wstring* crash_dir);
+std::wstring GetCrashDumpLocation();
 
 // Returns the contents of the specified |variable_name| from the environment
 // block of the calling process. Returns an empty string if the variable does
 // not exist.
 std::string GetEnvironmentString(const std::string& variable_name);
 std::wstring GetEnvironmentString16(const wchar_t* variable_name);
 
 // Sets the environment variable identified by |variable_name| to the value
 // identified by |new_value|.
 bool SetEnvironmentString(const std::string& variable_name,
@@ skipping 54 matching lines @@
 std::vector<std::string> TokenizeString(const std::string& str,
                                         char delimiter,
                                         bool trim_spaces);
 std::vector<std::wstring> TokenizeString16(const std::wstring& str,
                                            wchar_t delimiter,
                                            bool trim_spaces);
 
 // We assume that the command line |command_line| contains multiple switches
 // with the format --<switch name>=<switch value>. This function returns the
 // value of the |switch_name| passed in.
-std::string GetSwitchValueFromCommandLine(const std::string& command_line,
-                                          const std::string& switch_name);
+std::wstring GetSwitchValueFromCommandLine(const std::wstring& command_line,
+                                           const std::wstring& switch_name);
+
+// Ensures that the given |full_path| exists, and that the tail component is a
+// directory. If the directory does not already exist, it will be created.
+// Returns false if the final component exists but is not a directory, or on
+// failure to create a directory.
+bool RecursiveDirectoryCreate(const std::wstring& full_path);
 
 // Returns the unadorned channel name based on the channel strategy for the
 // install mode.
 std::wstring DetermineChannel(const InstallConstants& mode,
                               bool system_level,
                               bool multi_install);
 
 // Caches the |ProcessType| of the current process.
 extern ProcessType g_process_type;
 
 }  // namespace install_static
 
 #endif  // CHROME_INSTALL_STATIC_INSTALL_UTIL_H_