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

Unified Diff: webkit/appcache/appcache_host_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_host.cc ('k') | webkit/appcache/appcache_request_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/appcache_host_unittest.cc
diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc
index 2b322116a4c94cd987f0be4be5ec2ecaa1a2b91e..eea75c3120266a10490557323a71ac3d9849d6ef 100644
--- a/webkit/appcache/appcache_host_unittest.cc
+++ b/webkit/appcache/appcache_host_unittest.cc
@@ -189,7 +189,7 @@ TEST_F(AppCacheHostTest, Basic) {
TEST_F(AppCacheHostTest, SelectNoCache) {
scoped_refptr<MockQuotaManagerProxy> mock_quota_proxy(
new MockQuotaManagerProxy);
- service_.set_quota_manager_proxy(mock_quota_proxy);
+ service_.set_quota_manager_proxy(mock_quota_proxy.get());
// Reset our mock frontend
mock_frontend_.last_cache_id_ = -333;
@@ -350,13 +350,13 @@ TEST_F(AppCacheHostTest, SetSwappableCache) {
scoped_refptr<AppCacheGroup> group1(new AppCacheGroup(
service_.storage(), GURL(), service_.storage()->NewGroupId()));
- host.SetSwappableCache(group1);
+ host.SetSwappableCache(group1.get());
EXPECT_FALSE(host.swappable_cache_.get());
AppCache* cache1 = new AppCache(service_.storage(), 111);
cache1->set_complete(true);
group1->AddCache(cache1);
- host.SetSwappableCache(group1);
+ host.SetSwappableCache(group1.get());
EXPECT_EQ(cache1, host.swappable_cache_.get());
mock_frontend_.last_host_id_ = -222; // to verify we received OnCacheSelected
@@ -399,15 +399,15 @@ TEST_F(AppCacheHostTest, SetSwappableCache) {
cache5->set_complete(true);
group2->AddCache(cache5);
host.group_being_updated_ = group2;
- host.OnUpdateComplete(group2);
- EXPECT_FALSE(host.group_being_updated_);
+ host.OnUpdateComplete(group2.get());
+ EXPECT_FALSE(host.group_being_updated_.get());
EXPECT_EQ(cache5, host.swappable_cache_.get());
group2->RemoveCache(cache5);
EXPECT_FALSE(group2->HasCache());
host.group_being_updated_ = group2;
- host.OnUpdateComplete(group2);
- EXPECT_FALSE(host.group_being_updated_);
+ host.OnUpdateComplete(group2.get());
+ EXPECT_FALSE(host.group_being_updated_.get());
EXPECT_FALSE(host.swappable_cache_.get()); // group2 had no newest cache
}
@@ -450,7 +450,7 @@ TEST_F(AppCacheHostTest, SelectCacheAllowed) {
new MockQuotaManagerProxy);
MockAppCachePolicy mock_appcache_policy;
mock_appcache_policy.can_create_return_value_ = true;
- service_.set_quota_manager_proxy(mock_quota_proxy);
+ service_.set_quota_manager_proxy(mock_quota_proxy.get());
service_.set_appcache_policy(&mock_appcache_policy);
// Reset our mock frontend
@@ -488,7 +488,7 @@ TEST_F(AppCacheHostTest, SelectCacheBlocked) {
new MockQuotaManagerProxy);
MockAppCachePolicy mock_appcache_policy;
mock_appcache_policy.can_create_return_value_ = false;
- service_.set_quota_manager_proxy(mock_quota_proxy);
+ service_.set_quota_manager_proxy(mock_quota_proxy.get());
service_.set_appcache_policy(&mock_appcache_policy);
// Reset our mock frontend
« no previous file with comments | « webkit/appcache/appcache_host.cc ('k') | webkit/appcache/appcache_request_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698