summaryrefslogtreecommitdiffstats
path: root/content/zygote/zygote_linux.cc
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 07:03:29 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 07:03:29 +0000
commit5c9cddd6a0bae2fe464dd0bea90d73dbc8632189 (patch)
tree8ef1562ad7b179194c56217a421537ec32968702 /content/zygote/zygote_linux.cc
parent0f04828706952e06edbe594aa0e90c0def42a98b (diff)
downloadchromium_src-5c9cddd6a0bae2fe464dd0bea90d73dbc8632189.zip
chromium_src-5c9cddd6a0bae2fe464dd0bea90d73dbc8632189.tar.gz
chromium_src-5c9cddd6a0bae2fe464dd0bea90d73dbc8632189.tar.bz2
Revert 240527 "Revert of https://codereview.chromium.org/99133015/"
Reverting the revert, as the Linux Tests(dbg)(1) bot greened itself. > Revert of https://codereview.chromium.org/99133015/ > Reason for revert: Appears to have caused failures on linux dbg test 1 > > TBR=jorgelo@chromium.org,rsesek@chromium.org,mseaborn@chromium.org,piman@chromium.org,jln@chromium.org > NOTREECHECKS=true > NOTRY=true > > Review URL: https://codereview.chromium.org/114483003 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/113353003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote/zygote_linux.cc')
-rw-r--r--content/zygote/zygote_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc
index 759a920..2f0bd20 100644
--- a/content/zygote/zygote_linux.cc
+++ b/content/zygote/zygote_linux.cc
@@ -21,7 +21,7 @@
#include "base/posix/unix_domain_socket_linux.h"
#include "base/process/kill.h"
#include "content/common/child_process_sandbox_support_impl_linux.h"
-#include "content/common/sandbox_linux.h"
+#include "content/common/sandbox_linux/sandbox_linux.h"
#include "content/common/set_process_title.h"
#include "content/common/zygote_commands_linux.h"
#include "content/public/common/content_descriptors.h"