Revert 48186, 48196, 48198

sandbox/src/file_policy_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2010 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 <windows.h>
 #include <winioctl.h>
 
 #include "base/scoped_handle_win.h"
 #include "sandbox/src/nt_internals.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_factory.h"
@@ skipping 243 matching lines @@
   runner.SetTestState(BEFORE_REVERT);
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"File_CreateSys32 calc.exe"));
 }
 
 TEST(FilePolicyTest, AllowReadOnly) {
   TestRunner runner;
 
   // Create a temp file because we need write access to it.
   wchar_t temp_directory[MAX_PATH];
   wchar_t temp_file_name[MAX_PATH];
-  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
+  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
 
   EXPECT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_READONLY,
                                temp_file_name));
 
   wchar_t command_read[MAX_PATH + 20] = {0};
   wsprintf(command_read, L"File_Create Read \"%ls\"", temp_file_name);
   wchar_t command_write[MAX_PATH + 20] = {0};
   wsprintf(command_write, L"File_Create Write \"%ls\"", temp_file_name);
 
   // Verify that we have read access after revert.
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(command_read));
 
   // Verify that we don't have write access after revert.
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(command_write));
 
   // Verify that we really have write access to the file.
   runner.SetTestState(BEFORE_REVERT);
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(command_write));
 
   DeleteFile(temp_file_name);
 }
 
 TEST(FilePolicyTest, AllowWildcard) {
   TestRunner runner;
 
   // Create a temp file because we need write access to it.
   wchar_t temp_directory[MAX_PATH];
   wchar_t temp_file_name[MAX_PATH];
-  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
+  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
 
   wcscat_s(temp_directory, MAX_PATH, L"*");
   EXPECT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_ANY, temp_directory));
 
   wchar_t command_write[MAX_PATH + 20] = {0};
   wsprintf(command_write, L"File_Create Write \"%ls\"", temp_file_name);
 
   // Verify that we have write access after revert.
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(command_write));
 
@@ skipping 70 matching lines @@
   // Give access to the temp directory.
   wchar_t temp_directory[MAX_PATH];
   wchar_t temp_file_name1[MAX_PATH];
   wchar_t temp_file_name2[MAX_PATH];
   wchar_t temp_file_name3[MAX_PATH];
   wchar_t temp_file_name4[MAX_PATH];
   wchar_t temp_file_name5[MAX_PATH];
   wchar_t temp_file_name6[MAX_PATH];
   wchar_t temp_file_name7[MAX_PATH];
   wchar_t temp_file_name8[MAX_PATH];
-  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name1), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name2), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name3), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name4), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name5), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name6), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name7), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name8), 0u);
+  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name1), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name2), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name3), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name4), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name5), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name6), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name7), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name8), 0);
 
 
   // Add rules to make file1->file2 succeed.
   ASSERT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_ANY, temp_file_name1));
   ASSERT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_ANY, temp_file_name2));
 
   // Add rules to make file3->file4 fail.
   ASSERT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_ANY, temp_file_name3));
   ASSERT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_READONLY,
                                temp_file_name4));
@@ skipping 87 matching lines @@
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"File_GetDiskSpace"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"File_Win32Create notepad.exe"));
 }
 
 TEST(FilePolicyTest, TestReparsePoint) {
   TestRunner runner;
 
   // Create a temp file because we need write access to it.
   wchar_t temp_directory[MAX_PATH];
   wchar_t temp_file_name[MAX_PATH];
-  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
-  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
+  ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0);
+  ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
 
   // Delete the file and create a directory instead.
   ASSERT_TRUE(::DeleteFile(temp_file_name));
   ASSERT_TRUE(::CreateDirectory(temp_file_name, NULL));
 
   // Create a temporary file in the subfolder.
   std::wstring subfolder = temp_file_name;
   std::wstring temp_file_title = subfolder.substr(subfolder.rfind(L"\\") + 1);
   std::wstring temp_file = subfolder + L"\\file_" + temp_file_title;
 
@@ skipping 50 matching lines @@
   EXPECT_TRUE(INVALID_HANDLE_VALUE != dir);
   EXPECT_TRUE(DeleteReparsePoint(dir));
   EXPECT_TRUE(::CloseHandle(dir));
 
   // Cleanup.
   EXPECT_TRUE(::DeleteFile(temp_file_in_temp.c_str()));
   EXPECT_TRUE(::RemoveDirectory(subfolder.c_str()));
 }
 
 }  // namespace sandbox