summaryrefslogtreecommitdiffstats
path: root/chrome/common/property_bag_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 /chrome/common/property_bag_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 'chrome/common/property_bag_unittest.cc')
-rw-r--r--chrome/common/property_bag_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/property_bag_unittest.cc b/chrome/common/property_bag_unittest.cc
index 51db07c..6dca90c 100644
--- a/chrome/common/property_bag_unittest.cc
+++ b/chrome/common/property_bag_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.
@@ -10,7 +10,7 @@ TEST(PropertyBagTest, AddQueryRemove) {
PropertyAccessor<int> adaptor;
// Should be no match initially.
- EXPECT_EQ(NULL, adaptor.GetProperty(&bag));
+ EXPECT_TRUE(NULL == adaptor.GetProperty(&bag));
// Add the value and make sure we get it back.
const int kFirstValue = 1;
@@ -26,7 +26,7 @@ TEST(PropertyBagTest, AddQueryRemove) {
// Remove the value and make sure it's gone.
adaptor.DeleteProperty(&bag);
- EXPECT_EQ(NULL, adaptor.GetProperty(&bag));
+ EXPECT_TRUE(NULL == adaptor.GetProperty(&bag));
}
TEST(PropertyBagTest, Copy) {
@@ -57,6 +57,6 @@ TEST(PropertyBagTest, Copy) {
// Clear it out, neither property should be left.
copy = PropertyBag();
- EXPECT_EQ(NULL, adaptor1.GetProperty(&copy));
- EXPECT_EQ(NULL, adaptor2.GetProperty(&copy));
+ EXPECT_TRUE(NULL == adaptor1.GetProperty(&copy));
+ EXPECT_TRUE(NULL == adaptor2.GetProperty(&copy));
}