Fixes for re-enabling more MSVC level 4 warnings: sandbox/ edition

sandbox/win/src/process_policy_test.cc

 // 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.
 
 #include <memory>
 #include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/win/scoped_handle.h"
@@ skipping 136 matching lines @@
   if (argc != 1) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
   if ((NULL == argv) || (NULL == argv[0])) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
 
   // TEST 4: Try file name in the app_name and current directory sets correctly.
   base::string16 system32 = MakeFullPathToSystem32(L"");
   wchar_t current_directory[MAX_PATH + 1];
-  int result4;
-  bool test_succeeded = false;
   DWORD ret = ::GetCurrentDirectory(MAX_PATH, current_directory);
   if (!ret)
     return SBOX_TEST_FIRST_ERROR;
+  if (ret >= MAX_PATH)
+    return SBOX_TEST_FAILED;
 
-  if (ret < MAX_PATH) {
-    current_directory[ret] = L'\\';
-    current_directory[ret+1] = L'\0';
-    if (::SetCurrentDirectory(system32.c_str())) {
-      result4 = CreateProcessHelper(argv[0], base::string16());
-      if (::SetCurrentDirectory(current_directory)) {
-        test_succeeded = true;
-      }
-    } else {
-      return SBOX_TEST_SECOND_ERROR;
-    }
-  }
-  if (!test_succeeded)
-    result4 = SBOX_TEST_FAILED;
+  current_directory[ret] = L'\\';
+  current_directory[ret+1] = L'\0';
+  if (!::SetCurrentDirectory(system32.c_str()))

[cpu_(ooo_6.6-7.5), 2014/07/10 00:49:34]

you are using the nice no brackets style for if() of a single statement here but
it seems that this is not the style of this file.

You can 1) follow the style of the file or 2) change the style of the file. If
you choose 2) please do a single change with that and tbr that if you want.

[Peter Kasting, 2014/07/10 01:19:31]

Good catch, I didn't look hard enough.

+    return SBOX_TEST_SECOND_ERROR;
 
-  return result4;
+  const int result4 = CreateProcessHelper(argv[0], base::string16());
+  return ::SetCurrentDirectory(current_directory) ? result4 : SBOX_TEST_FAILED;
 }
 
 SBOX_TESTS_COMMAND int Process_RunApp5(int argc, wchar_t **argv) {
   if (argc != 1) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
   if ((NULL == argv) || (NULL == argv[0])) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
   base::string16 path = MakeFullPathToSystem32(argv[0]);
@@ skipping 190 matching lines @@
   ASSERT_TRUE(!exe_path.empty());
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_PROCESS,
                              TargetPolicy::PROCESS_ALL_EXEC,
                              exe_path.c_str()));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED,
             runner.RunTest(L"Process_GetChildProcessToken findstr.exe"));
 }
 
 }  // namespace sandbox