diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 4 | ||||
| -rw-r--r-- | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index 3871966..e3565b0 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -35,6 +35,7 @@ #if defined(OS_POSIX) #include <signal.h> +#include "base/posix/global_descriptors.h" #endif namespace { @@ -503,7 +504,8 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, base::FileHandleMappingVector fds; if (main_launch && automation_proxy_.get()) { ipcfd = automation_proxy_->channel()->TakeClientFileDescriptor(); - fds.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + 3)); + fds.push_back(std::make_pair(ipcfd, + kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); options.fds_to_remap = &fds; } #endif diff --git a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc index cbbf5a9..4b5bc87 100644 --- a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" +#include "base/posix/global_descriptors.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/test/test_timeouts.h" @@ -52,7 +53,8 @@ bool LaunchNSSDecrypterChildProcess(const base::FilePath& nss_path, file_util::ScopedFD client_file_descriptor_closer(&ipcfd); base::FileHandleMappingVector fds_to_map; - fds_to_map.push_back(std::pair<int,int>(ipcfd, kPrimaryIPCChannel + 3)); + fds_to_map.push_back(std::pair<int,int>(ipcfd, + kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch( switches::kDebugChildren); |