diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 19:02:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 19:02:35 +0000 |
| commit | 42f558fdef03f1ec2261f554151d8a4d168919e4 (patch) | |
| tree | a2f2403061c945c8983524036bc73550098de6b7 /chrome/test/automation | |
| parent | cb8d22b096bf5698bcf58725d6e4d7534e235a0a (diff) | |
| download | chromium_src-42f558fdef03f1ec2261f554151d8a4d168919e4.zip chromium_src-42f558fdef03f1ec2261f554151d8a4d168919e4.tar.gz chromium_src-42f558fdef03f1ec2261f554151d8a4d168919e4.tar.bz2 | |
Implement ScopedFD in terms of ScopedGeneric.
Move to a new file base/files/scoped_file.h. I will also add ScopedFILE to here (currently in file_util.h) later.
I think there is a crash in the old code in content/browser/zygote_host/zygote_host_impl_linux.cc that this patch should fix. The old ScopedFD took the address of something in a vector that is being modified.
I removed SafeScopedFD from content/common/sandbox_linux/sandbox_linux.cc since base's ScopedFD not CHECKs on close failure (this is a more recent addition).
Reland of https://codereview.chromium.org/191673003/
R=agl, viettrungluu
Review URL: https://codereview.chromium.org/202113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index 6171f28..e49c4d6 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -9,6 +9,7 @@ #include "base/environment.h" #include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/scoped_file.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" @@ -489,12 +490,11 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, #if defined(OS_WIN) options.start_hidden = !state.show_window; #elif defined(OS_POSIX) - int ipcfd = -1; - file_util::ScopedFD ipcfd_closer(&ipcfd); + base::ScopedFD ipcfd; base::FileHandleMappingVector fds; if (main_launch && automation_proxy_.get()) { - ipcfd = automation_proxy_->channel()->TakeClientFileDescriptor(); - fds.push_back(std::make_pair(ipcfd, + ipcfd.reset(automation_proxy_->channel()->TakeClientFileDescriptor()); + fds.push_back(std::make_pair(ipcfd.get(), kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); options.fds_to_remap = &fds; } |