diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:45:51 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:45:51 +0000 |
| commit | eb6f667f9198847d241c7aeb5f99bec060a479c3 (patch) | |
| tree | 70915b476c9e5342f7b92b79d0ad83cd2c0dcf29 /content/zygote | |
| parent | 7dde1158c05ca756de34a1aeda19b80932fc4dca (diff) | |
| download | chromium_src-eb6f667f9198847d241c7aeb5f99bec060a479c3.zip chromium_src-eb6f667f9198847d241c7aeb5f99bec060a479c3.tar.gz chromium_src-eb6f667f9198847d241c7aeb5f99bec060a479c3.tar.bz2 | |
clang: -Wunused-private-field cleanups, linux edition
BUG=none
TEST=none
TBR=owners
Review URL: https://chromiumcodereview.appspot.com/10694068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_linux.cc | 3 | ||||
| -rw-r--r-- | content/zygote/zygote_linux.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index 0258ace..3fcd996 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -24,7 +24,6 @@ #include "base/logging.h" #include "base/pickle.h" #include "base/posix/unix_domain_socket.h" -#include "content/common/seccomp_sandbox.h" #include "content/common/set_process_title.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/zygote_commands_linux.h" @@ -73,7 +72,9 @@ Zygote::Zygote(int sandbox_flags, int proc_fd_for_seccomp) : sandbox_flags_(sandbox_flags), helper_(helper), +#if defined(SECCOMP_SANDBOX) proc_fd_for_seccomp_(proc_fd_for_seccomp), +#endif initial_uma_sample_(0), initial_uma_boundary_value_(0) { if (helper_) { diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h index de27bb4..859bb37 100644 --- a/content/zygote/zygote_linux.h +++ b/content/zygote/zygote_linux.h @@ -10,6 +10,7 @@ #include "base/hash_tables.h" #include "base/process.h" +#include "content/common/seccomp_sandbox.h" class Pickle; class PickleIterator; @@ -97,8 +98,10 @@ class Zygote { const int sandbox_flags_; ZygoteForkDelegate* helper_; +#if defined(SECCOMP_SANDBOX) // File descriptor to proc under seccomp, -1 when not using seccomp. int proc_fd_for_seccomp_; +#endif // These might be set by helper_->InitialUMA. They supply a UMA enumeration // sample we should report on the first fork. |