[Win10 sandbox mitigations] Four new Win10 mitigations added.

sandbox/win/tests/common/controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
 #define SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
 
 #include <windows.h>
 #include <string>
 
@@ skipping 87 matching lines @@
 
   // Sets the timeout value for the child to run the command and return.
   void SetTimeout(DWORD timeout_ms);
 
   // Sets TestRunner to return without waiting for the process to exit.
   void SetAsynchronous(bool is_async) { is_async_ = is_async; }
 
   // 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);
 
   // Sets a flag whether the process should be killed when the TestRunner is
   // destroyed.
   void SetKillOnDestruction(bool value) { kill_on_destruction_ = value; }
 
   // Returns the pointers to the policy object. It can be used to modify
   // the policy manually.
   TargetPolicy* GetPolicy();
 
   BrokerServices* broker() { return broker_; }
 
   // Returns the process handle for an asynchronous test.
   HANDLE process() { return target_process_.Get(); }
 
   // Returns the process ID for an asynchronous test.
   DWORD process_id() { return target_process_id_; }
 
  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.
   int InternalRunTest(const wchar_t* command);
 
   BrokerServices* broker_;
   TargetPolicy* policy_;
   DWORD timeout_;
   SboxTestsState state_;
   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_;
 };
 
 // Returns the broker services.
 BrokerServices* GetBroker();
 
 // Constructs a full path to a file inside the system32 (or syswow64) folder.
 base::string16 MakePathToSys(const wchar_t* name, bool is_obj_man_path);
 
 // Runs the given test on the target process.
 int DispatchCall(int argc, wchar_t **argv);
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_