chrome/test/automation/automation_proxy.cc - Issue 7870008: Wait properly for renderer crashes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/automation/automation_proxy.cc

Issue 7870008: Wait properly for renderer crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win? Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/test/automation/automation_proxy.cc

diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc

index 4704deb243ae1655e795bca3dba10bd41508cac1..c5835029095a5b4b05c7c3c6883dc3fcf052e3f6 100644

--- a/chrome/test/automation/automation_proxy.cc

+++ b/chrome/test/automation/automation_proxy.cc

@@ -433,12 +433,8 @@ 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;

- const int ipcfd = channel_->GetClientFileDescriptor();

- if (ipcfd > -1)

- map.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + 3));

- return map;

+int AutomationProxy::TakeClientFileDescriptor() {

+ return channel_->TakeClientFileDescriptor();

}

#endif // defined(OS_POSIX)