Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1228)

Unified Diff: content/browser/appcache/appcache_group_unittest.cc

Issue 478053003: Remove implicit conversions from scoped_refptr to T* in content/browser/appcache/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/appcache/appcache_disk_cache_unittest.cc ('k') | content/browser/appcache/appcache_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/appcache/appcache_group_unittest.cc
diff --git a/content/browser/appcache/appcache_group_unittest.cc b/content/browser/appcache/appcache_group_unittest.cc
index ad45b3ba47df085fcf5787c8ee98fdd5f02aa811..16cf506642041e30b3b201124755de375aa4d897 100644
--- a/content/browser/appcache/appcache_group_unittest.cc
+++ b/content/browser/appcache/appcache_group_unittest.cc
@@ -111,60 +111,60 @@ TEST_F(AppCacheGroupTest, AddRemoveCache) {
cache1->set_complete(true);
cache1->set_update_time(now);
group->AddCache(cache1.get());
- EXPECT_EQ(cache1, group->newest_complete_cache());
+ EXPECT_EQ(cache1.get(), group->newest_complete_cache());
// Adding older cache does not change newest complete cache.
scoped_refptr<AppCache> cache2(new AppCache(service.storage(), 222));
cache2->set_complete(true);
cache2->set_update_time(now - base::TimeDelta::FromDays(1));
group->AddCache(cache2.get());
- EXPECT_EQ(cache1, group->newest_complete_cache());
+ EXPECT_EQ(cache1.get(), group->newest_complete_cache());
// Adding newer cache does change newest complete cache.
scoped_refptr<AppCache> cache3(new AppCache(service.storage(), 333));
cache3->set_complete(true);
cache3->set_update_time(now + base::TimeDelta::FromDays(1));
group->AddCache(cache3.get());
- EXPECT_EQ(cache3, group->newest_complete_cache());
+ EXPECT_EQ(cache3.get(), group->newest_complete_cache());
// Adding cache with same update time uses one with larger ID.
scoped_refptr<AppCache> cache4(new AppCache(service.storage(), 444));
cache4->set_complete(true);
cache4->set_update_time(now + base::TimeDelta::FromDays(1)); // same as 3
group->AddCache(cache4.get());
- EXPECT_EQ(cache4, group->newest_complete_cache());
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache());
// smaller id
scoped_refptr<AppCache> cache5(new AppCache(service.storage(), 55));
cache5->set_complete(true);
cache5->set_update_time(now + base::TimeDelta::FromDays(1)); // same as 4
group->AddCache(cache5.get());
- EXPECT_EQ(cache4, group->newest_complete_cache()); // no change
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache()); // no change
// Old caches can always be removed.
group->RemoveCache(cache1.get());
EXPECT_FALSE(cache1->owning_group());
- EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache()); // newest unchanged
// Remove rest of caches.
group->RemoveCache(cache2.get());
EXPECT_FALSE(cache2->owning_group());
- EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache()); // newest unchanged
group->RemoveCache(cache3.get());
EXPECT_FALSE(cache3->owning_group());
- EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache()); // newest unchanged
group->RemoveCache(cache5.get());
EXPECT_FALSE(cache5->owning_group());
- EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache()); // newest unchanged
group->RemoveCache(cache4.get()); // newest removed
EXPECT_FALSE(cache4->owning_group());
EXPECT_FALSE(group->newest_complete_cache()); // no more newest cache
// Can remove newest cache if there are older caches.
group->AddCache(cache1.get());
- EXPECT_EQ(cache1, group->newest_complete_cache());
+ EXPECT_EQ(cache1.get(), group->newest_complete_cache());
group->AddCache(cache4.get());
- EXPECT_EQ(cache4, group->newest_complete_cache());
+ EXPECT_EQ(cache4.get(), group->newest_complete_cache());
group->RemoveCache(cache4.get()); // remove newest
EXPECT_FALSE(cache4->owning_group());
EXPECT_FALSE(group->newest_complete_cache()); // newest removed
« no previous file with comments | « content/browser/appcache/appcache_disk_cache_unittest.cc ('k') | content/browser/appcache/appcache_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698