diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 13:35:06 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 13:35:06 +0000 |
| commit | b0df57cf1f90cd46703023be0f6ab8c6175f7771 (patch) | |
| tree | 7bd956e684159a29e115d56fafd1583a74c645f1 /chrome/test/automation | |
| parent | e387e46fd352bf8baa35c403f9c95905ade0feda (diff) | |
| download | chromium_src-b0df57cf1f90cd46703023be0f6ab8c6175f7771.zip chromium_src-b0df57cf1f90cd46703023be0f6ab8c6175f7771.tar.gz chromium_src-b0df57cf1f90cd46703023be0f6ab8c6175f7771.tar.bz2 | |
Revert of Implement ScopedFD in terms of ScopedGeneric. (https://codereview.chromium.org/191673003/)
Reason for revert:
Doesn't correctly link
/mnt/data/b/build/slave/Chromium_Linux_Codesearch/build/src/third_party/gold/gold64: warning: hidden symbol 'base::internal::ScopedFDCloseTraits::Free(int)' in obj/base/files/nacl_helper.scoped_file.o is referenced by DSO lib/libipc.so
Original issue's description:
> 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).
>
> BUG=
> R=agl@chromium.org, viettrungluu@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257001
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257179
TBR=viettrungluu@chromium.org,agl@chromium.org,brettw@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/201203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257323 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 e49c4d6..6171f28 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -9,7 +9,6 @@ #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" @@ -490,11 +489,12 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, #if defined(OS_WIN) options.start_hidden = !state.show_window; #elif defined(OS_POSIX) - base::ScopedFD ipcfd; + int ipcfd = -1; + file_util::ScopedFD ipcfd_closer(&ipcfd); base::FileHandleMappingVector fds; if (main_launch && automation_proxy_.get()) { - ipcfd.reset(automation_proxy_->channel()->TakeClientFileDescriptor()); - fds.push_back(std::make_pair(ipcfd.get(), + ipcfd = automation_proxy_->channel()->TakeClientFileDescriptor(); + fds.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); options.fds_to_remap = &fds; } |