summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webcursor_unittest.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
commitbe952c3ca6d93968409b246c9439a7d8c2a06bba (patch)
tree501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /webkit/glue/webcursor_unittest.cc
parent86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff)
downloadchromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz
chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors or NULL used in non-pointer context. BUG=none TEST=app_unittests && base_unittests --gtest_filter=-ConditionVariableTest.LargeFastTaskTest patch by Jacob Mandelson <jlmjlm [at] gmail> http://codereview.chromium.org/171028/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webcursor_unittest.cc')
-rw-r--r--webkit/glue/webcursor_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/webcursor_unittest.cc b/webkit/glue/webcursor_unittest.cc
index 1a15bf8..51fd433 100644
--- a/webkit/glue/webcursor_unittest.cc
+++ b/webkit/glue/webcursor_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
@@ -22,7 +22,7 @@ TEST(WebCursorTest, CursorSerialization) {
ok_custom_pickle.WriteInt(4);
ok_custom_pickle.WriteUInt32(0);
// Custom Windows message.
- ok_custom_pickle.WriteIntPtr(NULL);
+ ok_custom_pickle.WriteIntPtr(0);
void* iter = NULL;
EXPECT_TRUE(custom_cursor.Deserialize(&ok_custom_pickle, &iter));
@@ -39,7 +39,7 @@ TEST(WebCursorTest, CursorSerialization) {
short_custom_pickle.WriteInt(3);
short_custom_pickle.WriteUInt32(0);
// Custom Windows message.
- ok_custom_pickle.WriteIntPtr(NULL);
+ ok_custom_pickle.WriteIntPtr(0);
iter = NULL;
EXPECT_FALSE(custom_cursor.Deserialize(&short_custom_pickle, &iter));
@@ -58,7 +58,7 @@ TEST(WebCursorTest, CursorSerialization) {
for (int i = 0; i < kTooBigSize; ++i)
large_custom_pickle.WriteUInt32(0);
// Custom Windows message.
- ok_custom_pickle.WriteIntPtr(NULL);
+ ok_custom_pickle.WriteIntPtr(0);
iter = NULL;
EXPECT_FALSE(custom_cursor.Deserialize(&large_custom_pickle, &iter));
@@ -75,7 +75,7 @@ TEST(WebCursorTest, CursorSerialization) {
neg_custom_pickle.WriteInt(4);
neg_custom_pickle.WriteUInt32(0);
// Custom Windows message.
- neg_custom_pickle.WriteIntPtr(NULL);
+ neg_custom_pickle.WriteIntPtr(0);
iter = NULL;
EXPECT_FALSE(custom_cursor.Deserialize(&neg_custom_pickle, &iter));
}