Fix -Wunreachable-code-aggressive: sandbox/

Bug: 1066980
Change-Id: Ia1c48a2adb15e8bb27fc817a15a49cf1083095b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2993567
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#897877}

Author: pkasting

sandbox/win/src/file_policy_test.cc

@@ -89,14 +89,11 @@ SBOX_TESTS_COMMAND int File_Win32Create(int argc, wchar_t** argv) {
   if (INVALID_HANDLE_VALUE != file) {
     ::CloseHandle(file);
     return SBOX_TEST_SUCCEEDED;
-  } else {
-    if (ERROR_ACCESS_DENIED == ::GetLastError()) {
-      return SBOX_TEST_DENIED;
-    } else {
-      return SBOX_TEST_FAILED;
-    }
   }
-  return SBOX_TEST_SUCCEEDED;
+  if (ERROR_ACCESS_DENIED == ::GetLastError()) {
+    return SBOX_TEST_DENIED;
+  }
+  return SBOX_TEST_FAILED;
 }
 
 // Creates the file in parameter using the NtCreateFile api and returns if the

sandbox/win/tests/common/controller.cc

@@ -178,8 +178,7 @@ bool TestRunner::AddFsRule(TargetPolicy::Semantics semantics,
 }
 
 int TestRunner::RunTest(const wchar_t* command) {
-  if (MAX_STATE > 10)
-    return SBOX_TEST_INVALID_PARAMETER;
+  DCHECK_LE(MAX_STATE, 10);
 
   wchar_t state_number[2];
   state_number[0] = static_cast<wchar_t>(L'0' + state_);