Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: chrome/test/chromedriver/chrome/chrome_finder.cc

Issue 965653002: Fix android GN build for chromedriver test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed empty string arg to FilePath ctor Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome/chrome_finder.cc
diff --git a/chrome/test/chromedriver/chrome/chrome_finder.cc b/chrome/test/chromedriver/chrome/chrome_finder.cc
index dcc5172ff55513939445df9c27b98c8fd0c824c6..4cd5da66ceca1d1a94c05451b4cc5a4e33d35e49 100644
--- a/chrome/test/chromedriver/chrome/chrome_finder.cc
+++ b/chrome/test/chromedriver/chrome/chrome_finder.cc
@@ -52,6 +52,10 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
locations->push_back(base::FilePath("/bin"));
locations->push_back(base::FilePath("/sbin"));
}
+#elif defined(OS_ANDROID)
+void GetApplicationDirs(std::vector<base::FilePath>* locations) {
+ // On Android we won't be able to find Chrome executable
+}
#endif
} // namespace
@@ -82,23 +86,23 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations);
#endif
bool FindChrome(base::FilePath* browser_exe) {
-#if defined(OS_WIN)
base::FilePath browser_exes_array[] = {
+#if defined(OS_WIN)
base::FilePath(L"chrome.exe")
- };
#elif defined(OS_MACOSX)
- base::FilePath browser_exes_array[] = {
base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
base::FilePath("Chromium.app/Contents/MacOS/Chromium")
- };
#elif defined(OS_LINUX)
- base::FilePath browser_exes_array[] = {
base::FilePath("google-chrome"),
base::FilePath("chrome"),
base::FilePath("chromium"),
base::FilePath("chromium-browser")
- };
+#else
+ // it will compile but won't work on other OSes
+ base::FilePath()
#endif
+ };
+
std::vector<base::FilePath> browser_exes(
browser_exes_array, browser_exes_array + arraysize(browser_exes_array));
base::FilePath module_dir;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698