summaryrefslogtreecommitdiff
path: root/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc')
-rw-r--r--www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc25
1 files changed, 17 insertions, 8 deletions
diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
index f5fe40c84bdf..bc1ef57596ed 100644
--- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-08-04 12:10:50 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-12-23 12:33:28 UTC
+++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
+@@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
installation_locations[i].Append(L"Chromium\\Application"));
}
}
@@ -9,12 +9,21 @@
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
// TODO: Respect users' PATH variables.
// Until then, we use an approximation of the most common defaults.
-@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) {
- base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
- base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
- base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
+@@ -125,7 +125,7 @@ std::vector<base::FilePath> GetChromeProgramNames() {
+ chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
+ base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
+ base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::FilePath(chrome::kBrowserProcessExecutablePath),
- base::FilePath("chrome"), // Chrome for Testing or Google Chrome
- base::FilePath("google-chrome"),
+ base::FilePath("chrome"), // Chrome for Testing or Google Chrome
+ base::FilePath("google-chrome"), base::FilePath("chromium"),
+@@ -141,7 +141,7 @@ std::vector<base::FilePath> GetHeadlessShellProgramNam
+ return {
+ #if BUILDFLAG(IS_WIN)
+ base::FilePath(FILE_PATH_LITERAL("chrome-headless-shell.exe")),
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ base::FilePath("chrome-headless-shell"),
+ #else
+ // it will compile but won't work on other OSes