Bug 1272062 - Merge security/sandbox/linux/common into its parent directory. r=gcp

Now that SandboxInfo is always part of libmozsandbox, instead of being
in different places depending on widget, it doesn't need to be a
separate directory anymore.

Also updates a few comments that referenced it.

--HG--
rename : security/sandbox/linux/common/LinuxSched.h => security/sandbox/linux/LinuxSched.h
rename : security/sandbox/linux/common/SandboxInfo.cpp => security/sandbox/linux/SandboxInfo.cpp
rename : security/sandbox/linux/common/SandboxInfo.h => security/sandbox/linux/SandboxInfo.h

security/sandbox/linux/Sandbox.h

@@ -11,7 +11,7 @@
 #include "nsXULAppAPI.h"
 
 // This defines the entry points for a content process to start
-// sandboxing itself.  See also common/SandboxInfo.h for what parts of
+// sandboxing itself.  See also SandboxInfo.h for what parts of
 // sandboxing are enabled/supported.
 
 namespace mozilla {

security/sandbox/linux/SandboxChroot.h

@@ -14,7 +14,7 @@
 // This class uses the chroot(2) system call and Linux namespaces to
 // revoke the process's access to the filesystem.  It requires that
 // the process be able to create user namespaces; this is the
-// kHasUserNamespaces in common/SandboxInfo.h.
+// kHasUserNamespaces in SandboxInfo.h.
 //
 // Usage: call Prepare() from a thread with CAP_SYS_CHROOT in its
 // effective capability set, then later call Invoke() when ready to

security/sandbox/linux/broker/moz.build

@@ -21,8 +21,7 @@ if CONFIG['OS_TARGET'] == 'Android':
         DEFINES['HAVE_ANDROID_OS'] = True
 
 LOCAL_INCLUDES += [
-    '/security/sandbox/linux', # SandboxLogging.h
-    '/security/sandbox/linux/common', # SandboxInfo.h
+    '/security/sandbox/linux', # SandboxLogging.h, SandboxInfo.h
 ]
 
 # Need this for mozilla::ipc::FileDescriptor etc.

security/sandbox/linux/common/moz.build

@@ -1,20 +0,0 @@
-# -*- Mode: python; python-indent: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.mozilla += [
-    'SandboxInfo.h',
-]
-
-SOURCES += [
-    'SandboxInfo.cpp',
-]
-
-LOCAL_INCLUDES += [
-    '/security/sandbox/chromium',
-    '/security/sandbox/linux', # SandboxLogging.h
-]
-
-FINAL_LIBRARY = 'mozsandbox'

security/sandbox/linux/gtest/moz.build

@@ -16,7 +16,6 @@ SOURCES = [
 
 LOCAL_INCLUDES += [
     '/security/sandbox/linux',
-    '/security/sandbox/linux/common',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

security/sandbox/linux/moz.build

@@ -15,6 +15,7 @@ if CONFIG['OS_TARGET'] == 'Android':
 
 EXPORTS.mozilla += [
     'Sandbox.h',
+    'SandboxInfo.h',
 ]
 
 SOURCES += [
@@ -63,6 +64,7 @@ SOURCES += [
     'SandboxChroot.cpp',
     'SandboxFilter.cpp',
     'SandboxFilterUtil.cpp',
+    'SandboxInfo.cpp',
     'SandboxLogging.cpp',
     'SandboxUtil.cpp',
 ]
@@ -91,7 +93,7 @@ if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
 DEFINES['NS_NO_XPCOM'] = True
 DISABLE_STL_WRAPPING = True
 
-LOCAL_INCLUDES += ['/security/sandbox/linux/common']
+LOCAL_INCLUDES += ['/security/sandbox/linux']
 LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
 LOCAL_INCLUDES += ['/security/sandbox/chromium']
 LOCAL_INCLUDES += ['/nsprpub']
@@ -105,7 +107,6 @@ if CONFIG['OS_TARGET'] != 'Android':
 
 DIRS += [
     'broker',
-    'common',
     'glue',
     'interpose',
 ]