diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:04:55 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:04:55 +0000 |
| commit | 361e25c6d29fdae737b5ddf846606093b5502187 (patch) | |
| tree | 3114ddee1266088582391d5be9d0ab7aecbd5b8d /chrome/test/automation/automation_proxy.cc | |
| parent | c6b652b9298b037d8a18dd241061122200019dba (diff) | |
| download | chromium_src-361e25c6d29fdae737b5ddf846606093b5502187.zip chromium_src-361e25c6d29fdae737b5ddf846606093b5502187.tar.gz chromium_src-361e25c6d29fdae737b5ddf846606093b5502187.tar.bz2 | |
Linux: refactor zygote support
http://code.google.com/p/chromium/wiki/LinuxZygote
* Move Chrome specific bits out of base
* Move away from the idea of reserved file descriptors (which don't
really work with zygotes)
* Load resources before forking renderers (means that we don't need
communication between the zygote process and the renderers)
* Make sure that gdb works against the browser again
* Make sure that we have different ASLR between the renderers and the
browser.
http://codereview.chromium.org/119335
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.cc')
| -rw-r--r-- | chrome/test/automation/automation_proxy.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index e54f6a6..4410e2e 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -13,6 +13,7 @@ #include "base/process_util.h" #include "base/ref_counted.h" #include "base/waitable_event.h" +#include "chrome/common/chrome_descriptors.h" #include "chrome/test/automation/automation_constants.h" #include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/browser_proxy.h" @@ -440,10 +441,9 @@ scoped_refptr<BrowserProxy> AutomationProxy::GetLastActiveBrowserWindow() { #if defined(OS_POSIX) base::file_handle_mapping_vector AutomationProxy::fds_to_map() const { base::file_handle_mapping_vector map; - int src_fd = -1, dest_fd = -1; - channel_->GetClientFileDescriptorMapping(&src_fd, &dest_fd); - if (src_fd > -1) - map.push_back(std::make_pair(src_fd, dest_fd)); + const int ipcfd = channel_->GetClientFileDescriptor(); + if (ipcfd > -1) + map.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + 3)); return map; } #endif // defined(OS_POSIX) |