summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:13:07 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:13:07 +0000
commit9b6fee14acedde5c6b627d5f9b691776fc8d868c (patch)
tree8cd3438dc3b6504066f89096e37db4cff4b903ed /chrome/common/extensions/extension_unittest.cc
parentb1ed7b9beaf3069b54084c453da6db6bed56607c (diff)
downloadchromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.zip
chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.gz
chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.bz2
Avoid potential "NULL used as int" warnings by changing ASSERT_EQ(NULL, ...) to ASSERT_TRUE(... == NULL). Patch by Jacob Mandelson (see http://codereview.chromium.org/202057 ), r=me.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_unittest.cc')
-rw-r--r--chrome/common/extensions/extension_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index 249c719..43e116f 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -283,14 +283,14 @@ TEST(ExtensionTest, LoadPageActionHelper) {
DictionaryValue input;
// First try with an empty dictionary. We should get nothing back.
- ASSERT_EQ(NULL, extension.LoadExtensionActionHelper(
- &input, 0, &error_msg, ExtensionAction::PAGE_ACTION));
+ ASSERT_TRUE(extension.LoadExtensionActionHelper(
+ &input, 0, &error_msg, ExtensionAction::PAGE_ACTION) == NULL);
ASSERT_STRNE("", error_msg.c_str());
error_msg = "";
// Now try the same, but as a browser action. Ensure same results.
- ASSERT_EQ(NULL, extension.LoadExtensionActionHelper(
- &input, 0, &error_msg, ExtensionAction::BROWSER_ACTION));
+ ASSERT_TRUE(extension.LoadExtensionActionHelper(
+ &input, 0, &error_msg, ExtensionAction::BROWSER_ACTION) == NULL);
ASSERT_STRNE("", error_msg.c_str());
error_msg = "";