[Win10 sandbox mitigations] Four new Win10 mitigations added.

sandbox/win/tests/common/controller.h

Index: sandbox/win/tests/common/controller.h
diff --git a/sandbox/win/tests/common/controller.h b/sandbox/win/tests/common/controller.h
index a6498ed12e2a796d440ba1f5252d0b246094c67b..c6a540f81264359cbfde848c71d7e5a496eb48c2 100644
--- a/sandbox/win/tests/common/controller.h
+++ b/sandbox/win/tests/common/controller.h
@@ -105,6 +105,8 @@ class TestRunner {
   // Sets TestRunner to return without waiting for the process to exit.
   void SetUnsandboxed(bool is_no_sandbox) { no_sandbox_ = is_no_sandbox; }
 
+  void SetDisableCsrss(bool disable_csrss) { disable_csrss_ = disable_csrss; }

[Will Harris, 2016/01/30 00:28:43]

add comment

[penny, 2016/02/01 20:43:21]

Done.  Thanks.

+
   // Sets the desired state for the test to run.
   void SetTestState(SboxTestsState desired_state);
 
@@ -127,7 +129,8 @@ class TestRunner {
  private:
   // Initializes the data in the object. Sets is_init_ to tree if the
   // function succeeds. This is meant to be called from the constructor.
-  void Init(JobLevel job_level, TokenLevel startup_token,
+  void Init(JobLevel job_level,
+            TokenLevel startup_token,
             TokenLevel main_token);
 
   // The actual runner.
@@ -140,6 +143,7 @@ class TestRunner {
   bool is_init_;
   bool is_async_;
   bool no_sandbox_;
+  bool disable_csrss_;
   bool kill_on_destruction_;
   base::win::ScopedHandle target_process_;
   DWORD target_process_id_;