OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/chromedriver/chrome/chrome_finder.h" | 5 #include "chrome/test/chromedriver/chrome/chrome_finder.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 }; | 114 }; |
115 #endif | 115 #endif |
116 std::vector<base::FilePath> browser_exes( | 116 std::vector<base::FilePath> browser_exes( |
117 browser_exes_array, browser_exes_array + arraysize(browser_exes_array)); | 117 browser_exes_array, browser_exes_array + arraysize(browser_exes_array)); |
118 std::vector<base::FilePath> locations; | 118 std::vector<base::FilePath> locations; |
119 base::FilePath module_dir; | 119 base::FilePath module_dir; |
120 if (PathService::Get(base::DIR_MODULE, &module_dir)) | 120 if (PathService::Get(base::DIR_MODULE, &module_dir)) |
121 locations.push_back(module_dir); | 121 locations.push_back(module_dir); |
122 GetApplicationDirs(&locations); | 122 GetApplicationDirs(&locations); |
123 return internal::FindExe( | 123 return internal::FindExe( |
124 base::Bind(&file_util::PathExists), | 124 base::Bind(&base::PathExists), |
125 browser_exes, | 125 browser_exes, |
126 locations, | 126 locations, |
127 browser_exe); | 127 browser_exe); |
128 } | 128 } |
OLD | NEW |