| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Thu Mar 28 15:31:22 2013 +0000 |
| committer | Torne (Richard Coles) <torne@google.com> | Thu Mar 28 15:31:22 2013 +0000 |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e [diff] [blame] |
Merge from Chromium at DEPS revision r190564 This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc index 45d700b..7a174ef 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
@@ -6,10 +6,10 @@ #include <sys/wait.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/environment.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #include "sandbox/linux/suid/common/sandbox.h"