Bug 1093334 - Adjust includes of Linux sandboxing headers from Chromium. r=kang

Also re-sorts some of the includes into something closer to the style guide.

security/sandbox/linux/Sandbox.cpp

@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Sandbox.h"
+#include "SandboxFilter.h"
 #include "SandboxInternal.h"
 #include "SandboxLogging.h"
 
@@ -27,17 +28,11 @@
 #include "mozilla/NullPtr.h"
 #include "mozilla/SandboxInfo.h"
 #include "mozilla/unused.h"
-
+#include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
 #if defined(ANDROID)
-#include "android_ucontext.h"
+#include "sandbox/linux/services/android_ucontext.h"
 #endif
 
-#include "linux_seccomp.h"
-#include "SandboxFilter.h"
-
-// See definition of SandboxDie, below.
-#include "sandbox/linux/seccomp-bpf/die.h"
-
 #ifdef MOZ_ASAN
 // Copy libsanitizer declarations to avoid depending on ASAN headers.
 // See also bug 1081242 comment #4.

security/sandbox/linux/SandboxAssembler.cpp

@@ -9,12 +9,19 @@
 #include <errno.h>
 #include <utility>
 
-#include "linux_seccomp.h"
 #include "mozilla/NullPtr.h"
 #include "sandbox/linux/seccomp-bpf/codegen.h"
+#include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
+
+// Currently included only for struct arch_seccomp_data; newer
+// chromiums define it in sandbox/linux/bpf_dsl/trap_registry.h
+#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 
 namespace mozilla {
 
+// Need this for the SECCOMP_*_IDX macros to work.
+using sandbox::arch_seccomp_data;
+
 class SandboxAssemblerImpl {
   typedef sandbox::Instruction* NodePtr;
 

security/sandbox/linux/SandboxFilter.cpp

@@ -7,12 +7,6 @@
 #include "SandboxFilter.h"
 #include "SandboxAssembler.h"
 
-#include "linux_seccomp.h"
-#include "linux_syscalls.h"
-
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/NullPtr.h"
-
 #include <errno.h>
 #include <linux/ipc.h>
 #include <linux/net.h>
@@ -22,6 +16,11 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/NullPtr.h"
+#include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
+#include "sandbox/linux/services/linux_syscalls.h"
+
 namespace mozilla {
 
 class SandboxFilterImpl : public SandboxAssembler