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

Unified Diff: webkit/appcache/appcache_group_unittest.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « webkit/appcache/appcache_disk_cache.cc ('k') | webkit/appcache/appcache_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/appcache_group_unittest.cc
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc
index 738a2f1883aacee3893eaca182bf80d924aa0c2a..b4e571d9d468971c09ef45e16c223c5d25642dea 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/appcache/appcache_group_unittest.cc
@@ -110,62 +110,62 @@ TEST_F(AppCacheGroupTest, AddRemoveCache) {
scoped_refptr<AppCache> cache1(new AppCache(service.storage(), 111));
cache1->set_complete(true);
cache1->set_update_time(now);
- group->AddCache(cache1);
+ group->AddCache(cache1.get());
EXPECT_EQ(cache1, 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);
+ group->AddCache(cache2.get());
EXPECT_EQ(cache1, 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);
+ group->AddCache(cache3.get());
EXPECT_EQ(cache3, 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);
+ group->AddCache(cache4.get());
EXPECT_EQ(cache4, 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);
+ group->AddCache(cache5.get());
EXPECT_EQ(cache4, group->newest_complete_cache()); // no change
// Old caches can always be removed.
- group->RemoveCache(cache1);
+ group->RemoveCache(cache1.get());
EXPECT_FALSE(cache1->owning_group());
EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
// Remove rest of caches.
- group->RemoveCache(cache2);
+ group->RemoveCache(cache2.get());
EXPECT_FALSE(cache2->owning_group());
EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
- group->RemoveCache(cache3);
+ group->RemoveCache(cache3.get());
EXPECT_FALSE(cache3->owning_group());
EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
- group->RemoveCache(cache5);
+ group->RemoveCache(cache5.get());
EXPECT_FALSE(cache5->owning_group());
EXPECT_EQ(cache4, group->newest_complete_cache()); // newest unchanged
- group->RemoveCache(cache4); // newest removed
+ 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);
+ group->AddCache(cache1.get());
EXPECT_EQ(cache1, group->newest_complete_cache());
- group->AddCache(cache4);
+ group->AddCache(cache4.get());
EXPECT_EQ(cache4, group->newest_complete_cache());
- group->RemoveCache(cache4); // remove newest
+ group->RemoveCache(cache4.get()); // remove newest
EXPECT_FALSE(cache4->owning_group());
EXPECT_FALSE(group->newest_complete_cache()); // newest removed
}
« no previous file with comments | « webkit/appcache/appcache_disk_cache.cc ('k') | webkit/appcache/appcache_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698