summaryrefslogtreecommitdiffstats
path: root/net/ftp
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 /net/ftp
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 'net/ftp')
-rw-r--r--net/ftp/ftp_auth_cache_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc
index f74762b..a4d8ef4 100644
--- a/net/ftp/ftp_auth_cache_unittest.cc
+++ b/net/ftp/ftp_auth_cache_unittest.cc
@@ -24,7 +24,7 @@ TEST(FtpAuthCacheTest, LookupAddRemove) {
scoped_refptr<AuthData> data3(new AuthData());
// Lookup non-existent entry.
- EXPECT_EQ(NULL, cache.Lookup(origin1));
+ EXPECT_TRUE(NULL == cache.Lookup(origin1));
// Add entry for origin1.
cache.Add(origin1, data1.get());
@@ -42,12 +42,12 @@ TEST(FtpAuthCacheTest, LookupAddRemove) {
// Remove entry of origin1.
cache.Remove(origin1);
- EXPECT_EQ(NULL, cache.Lookup(origin1));
+ EXPECT_TRUE(NULL == cache.Lookup(origin1));
EXPECT_EQ(data2.get(), cache.Lookup(origin2));
// Remove non-existent entry
cache.Remove(origin1);
- EXPECT_EQ(NULL, cache.Lookup(origin1));
+ EXPECT_TRUE(NULL == cache.Lookup(origin1));
EXPECT_EQ(data2.get(), cache.Lookup(origin2));
}
@@ -93,7 +93,7 @@ TEST(FtpAuthCacheTest, NormalizedKey) {
// Remove
cache.Remove(GURL("ftp://HOsT"));
- EXPECT_EQ(NULL, cache.Lookup(GURL("ftp://host")));
+ EXPECT_TRUE(NULL == cache.Lookup(GURL("ftp://host")));
}
TEST(FtpAuthCacheTest, EvictOldEntries) {
@@ -112,7 +112,7 @@ TEST(FtpAuthCacheTest, EvictOldEntries) {
// Adding one entry should cause eviction of the first entry.
cache.Add(GURL("ftp://last_host"), auth_data.get());
- EXPECT_EQ(NULL, cache.Lookup(GURL("ftp://host0")));
+ EXPECT_TRUE(NULL == cache.Lookup(GURL("ftp://host0")));
// Remaining entries should not get evicted.
for (size_t i = 1; i < FtpAuthCache::kMaxEntries; i++) {