| Index: chrome/browser/zygote_main_linux.cc
|
| diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
|
| index 9b8ef98bdc72a35a3283e52be75a258422df94fe..08f730ef8c1e9247c0337e424c38701cc4f39c97 100644
|
| --- a/chrome/browser/zygote_main_linux.cc
|
| +++ b/chrome/browser/zygote_main_linux.cc
|
| @@ -221,29 +221,15 @@ static bool MaybeEnterChroot() {
|
| }
|
|
|
| char reply;
|
| - std::vector<int> fds;
|
| - if (!base::RecvMsg(fd, &reply, 1, &fds)) {
|
| + if (HANDLE_EINTR(read(fd, &reply, 1)) != 1) {
|
| LOG(ERROR) << "Failed to read from chroot pipe: " << errno;
|
| return false;
|
| }
|
| +
|
| if (reply != kChrootMeSuccess) {
|
| LOG(ERROR) << "Error code reply from chroot helper";
|
| - for (size_t i = 0; i < fds.size(); ++i)
|
| - HANDLE_EINTR(close(fds[i]));
|
| - return false;
|
| - }
|
| - if (fds.size() != 1) {
|
| - LOG(ERROR) << "Bad number of file descriptors from chroot helper";
|
| - for (size_t i = 0; i < fds.size(); ++i)
|
| - HANDLE_EINTR(close(fds[i]));
|
| - return false;
|
| - }
|
| - if (fchdir(fds[0]) == -1) {
|
| - LOG(ERROR) << "Failed to chdir to root directory: " << errno;
|
| - HANDLE_EINTR(close(fds[0]));
|
| return false;
|
| }
|
| - HANDLE_EINTR(close(fds[0]));
|
|
|
| static const int kMagicSandboxIPCDescriptor = 5;
|
| SkiaFontConfigUseIPCImplementation(kMagicSandboxIPCDescriptor);
|
|
|