summaryrefslogtreecommitdiffstats
path: root/sandbox/src/file_policy_test.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 15:38:07 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 15:38:07 +0000
commitf55bd486ab0ada0402fdcd34fb70a20d155fd968 (patch)
tree1eb9cf7c078d40c20320126d34f4cc4694082b1f /sandbox/src/file_policy_test.cc
parent4b0bd5f4c2d58c1620b49628be68f877928025fd (diff)
downloadchromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.zip
chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.gz
chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.bz2
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/file_policy_test.cc')
-rw-r--r--sandbox/src/file_policy_test.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/sandbox/src/file_policy_test.cc b/sandbox/src/file_policy_test.cc
index f4a2e19..01a8383 100644
--- a/sandbox/src/file_policy_test.cc
+++ b/sandbox/src/file_policy_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
@@ -262,8 +262,8 @@ TEST(FilePolicyTest, AllowReadOnly) {
// 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), 0);
- ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
+ ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
+ ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
EXPECT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_READONLY,
temp_file_name));
@@ -292,8 +292,8 @@ TEST(FilePolicyTest, AllowWildcard) {
// 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), 0);
- ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
+ ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
+ ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
wcscat_s(temp_directory, MAX_PATH, L"*");
EXPECT_TRUE(runner.AddFsRule(TargetPolicy::FILES_ALLOW_ANY, temp_directory));
@@ -384,15 +384,15 @@ TEST(FilePolicyTest, TestRename) {
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), 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);
+ 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);
// Add rules to make file1->file2 succeed.
@@ -500,8 +500,8 @@ TEST(FilePolicyTest, TestReparsePoint) {
// 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), 0);
- ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0);
+ ASSERT_NE(::GetTempPath(MAX_PATH, temp_directory), 0u);
+ ASSERT_NE(::GetTempFileName(temp_directory, L"test", 0, temp_file_name), 0u);
// Delete the file and create a directory instead.
ASSERT_TRUE(::DeleteFile(temp_file_name));