Fix control.security to match the individual security_*/control files params

Change-Id: I622776e27bd21d591adf83dee4d02fffacb30d8c

BUG=chromium-os:13215
TEST=next autotest run will test this.

Review URL: http://codereview.chromium.org/6708003
diff --git a/server/site_tests/suites/control.security b/server/site_tests/suites/control.security
index f901285..8a3f169 100644
--- a/server/site_tests/suites/control.security
+++ b/server/site_tests/suites/control.security
@@ -18,12 +18,16 @@
 TESTS = [
   ('security_DbusOwners', {}),
   ('security_NetworkListeners', {}),
-  ('security_ProfilePermissions', {}),
+  ('security_ProfilePermissions', {'creds': '$default', 'tag': 'login'}),
+  #TODO(jimhebert) Uncomment this after chromium-os:13173 is fixed.
+  #('security_ProfilePermissions', {'creds': None, 'tag': 'BWSI'}),
   ('security_RendererSandbox', {}),
-  ('security_ReservedPrivileges', {}),
+  ('security_ReservedPrivileges', {'owner_type': 'user', 'tag': 'user'}),
+  ('security_ReservedPrivileges', {'owner_type': 'group', 'tag': 'group'}),
   ('security_RestartJob', {}),
   ('security_RootfsOwners', {}),
-  ('security_SuidBinaries', {}),
+  ('security_SuidBinaries', {'baseline': 'suid', 'tag': 'suid'}),
+  ('security_SuidBinaries', {'baseline': 'sgid', 'tag': 'sgid'}),
 ]
 
 # A dict which holds {machine: [(test, argv), (test, argv), ...]}