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_
@@ skipping 42 matching lines @@
 // 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 |exe_path| points to a Chrome installed in an SxS
 // installation.
 bool IsSxSChrome(const wchar_t* exe_path);
 
 // Returns true if |exe_path| points to a per-user level Chrome installation.
 bool IsSystemInstall(const wchar_t* exe_path);
 
 // Returns true if current installation of Chrome is a multi-install.
 bool IsMultiInstall(bool is_system_install);
@@ skipping 22 matching lines @@
 
 // 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
+// user. Returns false if all attempts at locating a User Data directory fail.
 // 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.
+// Populates |result| with the user data dir, respecting various overrides in
+// the manner of chrome_main_delegate.cc InitializeUserDataDir(). This includes
+// overrides on the command line, overrides by registry policy, and fallback to
+// the default User Data dir if the directory is invalid or unspecified.
+bool GetUserDataDirectory(const std::wstring& user_data_dir_from_command_line,

[grt (UTC plus 2), 2016/11/16 13:24:52]

could you add unit tests for these new functions?

[scottmg, 2016/11/16 21:01:18]

Yeah, oops, they're in the file I forgot to add! 

+                          std::wstring* result);
+
+// The same as GetUserDataDirectory(), but directly queries the global command
+// line object for the --user-data-dir flag. This is the more commonly used
+// function, where GetUserDataDirectory() is used primiarily for testing.
+bool GetUserDataDirectoryUsingProcessCommandLine(std::wstring* result);
+
+// 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 GetDefaultCrashDumpLocation(std::wstring* crash_dir);
+bool GetCrashDumpLocation(std::wstring* crash_dir);
 
 // 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 std::wstring& 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 79 matching lines @@
 // -1 if version1 < version2.
 // 1 if version1 > version2.
 // Returns true on success, false on invalid strings being passed, etc.
 bool CompareVersionStrings(const std::string& version1,
                            const std::string& version2,
                            int* result);
 
 // 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);
 
 // Caches the |ProcessType| of the current process.
 extern ProcessType g_process_type;
 
 }  // namespace install_static
 
 #endif  // CHROME_INSTALL_STATIC_INSTALL_UTIL_H_