diff options
Diffstat (limited to 'webkit')
123 files changed, 1157 insertions, 970 deletions
diff --git a/webkit/appcache/appcache.cc b/webkit/appcache/appcache.cc index 92d688d..1d83a43 100644 --- a/webkit/appcache/appcache.cc +++ b/webkit/appcache/appcache.cc @@ -27,11 +27,11 @@ AppCache::AppCache(AppCacheStorage* storage, int64 cache_id) AppCache::~AppCache() { DCHECK(associated_hosts_.empty()); - if (owning_group_) { + if (owning_group_.get()) { DCHECK(is_complete_); owning_group_->RemoveCache(this); } - DCHECK(!owning_group_); + DCHECK(!owning_group_.get()); storage_->working_set()->RemoveCache(this); } diff --git a/webkit/appcache/appcache.h b/webkit/appcache/appcache.h index fee3169..f064873 100644 --- a/webkit/appcache/appcache.h +++ b/webkit/appcache/appcache.h @@ -36,7 +36,7 @@ class WEBKIT_STORAGE_EXPORT AppCache : public base::RefCounted<AppCache> { int64 cache_id() const { return cache_id_; } - AppCacheGroup* owning_group() const { return owning_group_; } + AppCacheGroup* owning_group() const { return owning_group_.get(); } bool is_complete() const { return is_complete_; } void set_complete(bool value) { is_complete_ = value; } diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/appcache/appcache_disk_cache.cc index 9587d11..0f537cc 100644 --- a/webkit/appcache/appcache_disk_cache.cc +++ b/webkit/appcache/appcache_disk_cache.cc @@ -155,7 +155,7 @@ AppCacheDiskCache::AppCacheDiskCache() } AppCacheDiskCache::~AppCacheDiskCache() { - if (create_backend_callback_) { + if (create_backend_callback_.get()) { create_backend_callback_->Cancel(); create_backend_callback_ = NULL; OnCreateBackendComplete(net::ERR_ABORTED); @@ -184,7 +184,7 @@ void AppCacheDiskCache::Disable() { is_disabled_ = true; - if (create_backend_callback_) { + if (create_backend_callback_.get()) { create_backend_callback_->Cancel(); create_backend_callback_ = NULL; OnCreateBackendComplete(net::ERR_ABORTED); diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc index 738a2f1..b4e571d 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 } diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc index c88b1d2..d04fd237 100644 --- a/webkit/appcache/appcache_host.cc +++ b/webkit/appcache/appcache_host.cc @@ -58,9 +58,9 @@ AppCacheHost::AppCacheHost(int host_id, AppCacheFrontend* frontend, AppCacheHost::~AppCacheHost() { FOR_EACH_OBSERVER(Observer, observers_, OnDestructionImminent(this)); - if (associated_cache_) + if (associated_cache_.get()) associated_cache_->UnassociateHost(this); - if (group_being_updated_) + if (group_being_updated_.get()) group_being_updated_->RemoveUpdateObserver(this); service_->storage()->CancelDelegateCallbacks(this); if (service()->quota_manager_proxy() && !origin_in_use_.is_empty()) @@ -208,7 +208,7 @@ void AppCacheHost::DoPendingStartUpdate() { // 6.9.8 Application cache API bool success = false; - if (associated_cache_ && associated_cache_->owning_group()) { + if (associated_cache_.get() && associated_cache_->owning_group()) { AppCacheGroup* group = associated_cache_->owning_group(); if (!group->is_obsolete() && !group->is_being_deleted()) { success = true; @@ -240,15 +240,15 @@ void AppCacheHost::DoPendingSwapCache() { // 6.9.8 Application cache API bool success = false; - if (associated_cache_ && associated_cache_->owning_group()) { + if (associated_cache_.get() && associated_cache_->owning_group()) { if (associated_cache_->owning_group()->is_obsolete()) { success = true; AssociateNoCache(GURL()); - } else if (swappable_cache_) { + } else if (swappable_cache_.get()) { DCHECK(swappable_cache_.get() == swappable_cache_->owning_group()->newest_complete_cache()); success = true; - AssociateCompleteCache(swappable_cache_); + AssociateCompleteCache(swappable_cache_.get()); } } @@ -321,7 +321,7 @@ Status AppCacheHost::GetStatus() { return CHECKING; if (cache->owning_group()->update_status() == AppCacheGroup::DOWNLOADING) return DOWNLOADING; - if (swappable_cache_) + if (swappable_cache_.get()) return UPDATE_READY; return IDLE; } @@ -418,7 +418,7 @@ void AppCacheHost::FinishCacheSelection( } void AppCacheHost::ObserveGroupBeingUpdated(AppCacheGroup* group) { - DCHECK(!group_being_updated_); + DCHECK(!group_being_updated_.get()); group_being_updated_ = group; newest_cache_of_group_being_updated_ = group->newest_complete_cache(); group->AddUpdateObserver(this); @@ -449,7 +449,7 @@ void AppCacheHost::SetSwappableCache(AppCacheGroup* group) { swappable_cache_ = NULL; } else { AppCache* new_cache = group->newest_complete_cache(); - if (new_cache != associated_cache_) + if (new_cache != associated_cache_.get()) swappable_cache_ = new_cache; else swappable_cache_ = NULL; @@ -459,7 +459,8 @@ void AppCacheHost::SetSwappableCache(AppCacheGroup* group) { void AppCacheHost::LoadMainResourceCache(int64 cache_id) { DCHECK(cache_id != kNoCacheId); if (pending_main_resource_cache_id_ == cache_id || - (main_resource_cache_ && main_resource_cache_->cache_id() == cache_id)) { + (main_resource_cache_.get() && + main_resource_cache_->cache_id() == cache_id)) { return; } pending_main_resource_cache_id_ = cache_id; @@ -496,7 +497,7 @@ void AppCacheHost::AssociateCompleteCache(AppCache* cache) { void AppCacheHost::AssociateCacheHelper(AppCache* cache, const GURL& manifest_url) { - if (associated_cache_) { + if (associated_cache_.get()) { associated_cache_->UnassociateHost(this); } diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc index 2b32211..eea75c3 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 diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/appcache/appcache_request_handler.cc index b400b14..eb0dc73 100644 --- a/webkit/appcache/appcache_request_handler.cc +++ b/webkit/appcache/appcache_request_handler.cc @@ -36,7 +36,7 @@ AppCacheStorage* AppCacheRequestHandler::storage() const { void AppCacheRequestHandler::GetExtraResponseInfo( int64* cache_id, GURL* manifest_url) { - if (job_ && job_->is_delivering_appcache_response()) { + if (job_.get() && job_->is_delivering_appcache_response()) { *cache_id = job_->cache_id(); *manifest_url = job_->manifest_url(); } @@ -55,7 +55,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource( // to the network involves restarting the request altogether, // which will call thru to our interception layer again. // This time thru, we return NULL so the request hits the wire. - if (job_) { + if (job_.get()) { DCHECK(job_->is_delivering_network_response() || job_->cache_entry_not_found()); if (job_->cache_entry_not_found()) @@ -81,12 +81,12 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource( // If its been setup to deliver a network response, we can just delete // it now and return NULL instead to achieve that since it couldn't // have been started yet. - if (job_ && job_->is_delivering_network_response()) { + if (job_.get() && job_->is_delivering_network_response()) { DCHECK(!job_->has_been_started()); job_ = NULL; } - return job_; + return job_.get(); } AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect( @@ -104,7 +104,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect( if (request->url().GetOrigin() == location.GetOrigin()) return NULL; - DCHECK(!job_); // our jobs never generate redirects + DCHECK(!job_.get()); // our jobs never generate redirects if (found_fallback_entry_.has_response_id()) { // 6.9.6, step 4: If this results in a redirect to another origin, @@ -121,7 +121,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect( // 6.9.6 step 3 and 5: Fetch the resource normally. } - return job_; + return job_.get(); } AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse( @@ -137,7 +137,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse( } // We don't fallback for responses that we delivered. - if (job_) { + if (job_.get()) { DCHECK(!job_->is_delivering_network_response()); return NULL; } @@ -164,7 +164,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse( DeliverAppCachedResponse( found_fallback_entry_, found_cache_id_, found_group_id_, found_manifest_url_, true, found_namespace_entry_url_); - return job_; + return job_.get(); } void AppCacheRequestHandler::OnDestructionImminent(AppCacheHost* host) { @@ -173,7 +173,7 @@ void AppCacheRequestHandler::OnDestructionImminent(AppCacheHost* host) { // Since the host is being deleted, we don't have to complete any job // that is current running. It's destined for the bit bucket anyway. - if (job_) { + if (job_.get()) { job_->Kill(); job_ = NULL; } @@ -183,7 +183,7 @@ void AppCacheRequestHandler::DeliverAppCachedResponse( const AppCacheEntry& entry, int64 cache_id, int64 group_id, const GURL& manifest_url, bool is_fallback, const GURL& namespace_entry_url) { - DCHECK(host_ && job_ && job_->is_waiting()); + DCHECK(host_ && job_.get() && job_->is_waiting()); DCHECK(entry.has_response_id()); if (ResourceType::IsFrame(resource_type_) && !namespace_entry_url.is_empty()) @@ -194,12 +194,12 @@ void AppCacheRequestHandler::DeliverAppCachedResponse( } void AppCacheRequestHandler::DeliverErrorResponse() { - DCHECK(job_ && job_->is_waiting()); + DCHECK(job_.get() && job_->is_waiting()); job_->DeliverErrorResponse(); } void AppCacheRequestHandler::DeliverNetworkResponse() { - DCHECK(job_ && job_->is_waiting()); + DCHECK(job_.get() && job_->is_waiting()); job_->DeliverNetworkResponse(); } @@ -207,7 +207,7 @@ void AppCacheRequestHandler::DeliverNetworkResponse() { void AppCacheRequestHandler::MaybeLoadMainResource( net::URLRequest* request, net::NetworkDelegate* network_delegate) { - DCHECK(!job_); + DCHECK(!job_.get()); DCHECK(host_); const AppCacheHost* spawning_host = @@ -227,14 +227,14 @@ void AppCacheRequestHandler::OnMainResponseFound( const GURL& url, const AppCacheEntry& entry, const GURL& namespace_entry_url, const AppCacheEntry& fallback_entry, int64 cache_id, int64 group_id, const GURL& manifest_url) { - DCHECK(job_); + DCHECK(job_.get()); DCHECK(host_); DCHECK(is_main_resource()); DCHECK(!entry.IsForeign()); DCHECK(!fallback_entry.IsForeign()); DCHECK(!(entry.has_response_id() && fallback_entry.has_response_id())); - if (!job_) + if (!job_.get()) return; AppCachePolicy* policy = host_->service()->appcache_policy(); @@ -285,7 +285,7 @@ void AppCacheRequestHandler::OnMainResponseFound( void AppCacheRequestHandler::MaybeLoadSubResource( net::URLRequest* request, net::NetworkDelegate* network_delegate) { - DCHECK(!job_); + DCHECK(!job_.get()); if (host_->is_selection_pending()) { // We have to wait until cache selection is complete and the @@ -308,9 +308,8 @@ void AppCacheRequestHandler::ContinueMaybeLoadSubResource() { // 6.9.6 Changes to the networking model // If the resource is not to be fetched using the HTTP GET mechanism or // equivalent ... then fetch the resource normally. - DCHECK(job_); - DCHECK(host_->associated_cache() && - host_->associated_cache()->is_complete()); + DCHECK(job_.get()); + DCHECK(host_->associated_cache() && host_->associated_cache()->is_complete()); const GURL& url = job_->request()->url(); AppCache* cache = host_->associated_cache(); diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 800c070..5343116 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -386,14 +386,14 @@ class AppCacheRequestHandlerTest : public testing::Test { // real network job gets created. We expect NULL here which will cause // the net library to create a real job. job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); - EXPECT_FALSE(job_); + EXPECT_FALSE(job_.get()); // Simulate an http error of the real network job. request_->SimulateResponseCode(500); job_ = handler_->MaybeLoadFallbackForResponse( request_.get(), empty_network_delegate_); - EXPECT_TRUE(job_); + EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_appcache_response()); int64 cache_id = kNoCacheId; @@ -446,7 +446,7 @@ class AppCacheRequestHandlerTest : public testing::Test { // real network job gets created. We expect NULL here which will cause // the net library to create a real job. job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); - EXPECT_FALSE(job_); + EXPECT_FALSE(job_.get()); // Simulate an http error of the real network job, but with custom // headers that override the fallback behavior. @@ -461,7 +461,7 @@ class AppCacheRequestHandlerTest : public testing::Test { job_ = handler_->MaybeLoadFallbackForResponse( request_.get(), empty_network_delegate_); - EXPECT_FALSE(job_); + EXPECT_FALSE(job_.get()); TestFinished(); } @@ -526,7 +526,7 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); - host_->FinishCacheSelection(cache, NULL); + host_->FinishCacheSelection(cache.get(), NULL); EXPECT_FALSE(job_->is_waiting()); EXPECT_TRUE(job_->is_delivering_error_response()); diff --git a/webkit/appcache/appcache_response.cc b/webkit/appcache/appcache_response.cc index ddd639c..a331b6ae8 100644 --- a/webkit/appcache/appcache_response.cc +++ b/webkit/appcache/appcache_response.cc @@ -204,8 +204,10 @@ void AppCacheResponseReader::ContinueReadData() { DCHECK(range_length_ >= read_position_); buffer_len_ = range_length_ - read_position_; } - ReadRaw(kResponseContentIndex, range_offset_ + read_position_, - buffer_, buffer_len_); + ReadRaw(kResponseContentIndex, + range_offset_ + read_position_, + buffer_.get(), + buffer_len_); } void AppCacheResponseReader::SetReadRange(int offset, int length) { @@ -216,13 +218,13 @@ void AppCacheResponseReader::SetReadRange(int offset, int length) { void AppCacheResponseReader::OnIOComplete(int result) { if (result >= 0) { - if (info_buffer_) { + if (info_buffer_.get()) { // Deserialize the http info structure, ensuring we got headers. Pickle pickle(buffer_->data(), result); scoped_ptr<net::HttpResponseInfo> info(new net::HttpResponseInfo); bool response_truncated = false; if (!info->InitFromPickle(pickle, &response_truncated) || - !info->headers) { + !info->headers.get()) { InvokeUserCompletionCallback(net::ERR_FAILED); return; } @@ -271,7 +273,7 @@ void AppCacheResponseReader::OnOpenEntryComplete( open_callback_.Reset(); } - if (info_buffer_) + if (info_buffer_.get()) ContinueReadInfo(); else ContinueReadData(); @@ -301,7 +303,7 @@ void AppCacheResponseWriter::WriteInfo( DCHECK(info_buf->http_info.get()); DCHECK(!buffer_.get()); DCHECK(!info_buffer_.get()); - DCHECK(info_buf->http_info->headers); + DCHECK(info_buf->http_info->headers.get()); info_buffer_ = info_buf; callback_ = callback; // cleared on completion @@ -320,7 +322,7 @@ void AppCacheResponseWriter::ContinueWriteInfo() { info_buffer_->http_info->Persist(pickle, kSkipTransientHeaders, kTruncated); write_amount_ = static_cast<int>(pickle->size()); buffer_ = new WrappedPickleIOBuffer(pickle); // takes ownership of pickle - WriteRaw(kResponseInfoIndex, 0, buffer_, write_amount_); + WriteRaw(kResponseInfoIndex, 0, buffer_.get(), write_amount_); } void AppCacheResponseWriter::WriteData( @@ -343,13 +345,14 @@ void AppCacheResponseWriter::ContinueWriteData() { ScheduleIOCompletionCallback(net::ERR_FAILED); return; } - WriteRaw(kResponseContentIndex, write_position_, buffer_, write_amount_); + WriteRaw( + kResponseContentIndex, write_position_, buffer_.get(), write_amount_); } void AppCacheResponseWriter::OnIOComplete(int result) { if (result >= 0) { DCHECK(write_amount_ == result); - if (!info_buffer_) + if (!info_buffer_.get()) write_position_ += result; else info_size_ = result; @@ -411,7 +414,7 @@ void AppCacheResponseWriter::OnCreateEntryComplete( create_callback_.Reset(); } - if (info_buffer_) + if (info_buffer_.get()) ContinueWriteInfo(); else ContinueWriteData(); diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc index 9d5e973..6cdcda0 100644 --- a/webkit/appcache/appcache_response_unittest.cc +++ b/webkit/appcache/appcache_response_unittest.cc @@ -158,7 +158,8 @@ class AppCacheResponseTest : public testing::Test { static const char* kHttpBody = "Hello"; scoped_refptr<IOBuffer> body(new WrappedIOBuffer(kHttpBody)); std::string raw_headers(kHttpHeaders, arraysize(kHttpHeaders)); - WriteResponse(MakeHttpResponseInfo(raw_headers), body, strlen(kHttpBody)); + WriteResponse( + MakeHttpResponseInfo(raw_headers), body.get(), strlen(kHttpBody)); } int basic_response_size() { return 5; } // should match kHttpBody above @@ -176,30 +177,29 @@ class AppCacheResponseTest : public testing::Test { EXPECT_FALSE(writer_->IsWritePending()); expected_write_result_ = GetHttpResponseInfoSize(head); write_info_buffer_ = new HttpResponseInfoIOBuffer(head); - writer_->WriteInfo( - write_info_buffer_, - base::Bind(&AppCacheResponseTest::OnWriteInfoComplete, - base::Unretained(this))); + writer_->WriteInfo(write_info_buffer_.get(), + base::Bind(&AppCacheResponseTest::OnWriteInfoComplete, + base::Unretained(this))); } void WriteResponseBody(scoped_refptr<IOBuffer> io_buffer, int buf_len) { EXPECT_FALSE(writer_->IsWritePending()); write_buffer_ = io_buffer; expected_write_result_ = buf_len; - writer_->WriteData( - write_buffer_, buf_len, - base::Bind(&AppCacheResponseTest::OnWriteComplete, - base::Unretained(this))); + writer_->WriteData(write_buffer_.get(), + buf_len, + base::Bind(&AppCacheResponseTest::OnWriteComplete, + base::Unretained(this))); } void ReadResponseBody(scoped_refptr<IOBuffer> io_buffer, int buf_len) { EXPECT_FALSE(reader_->IsReadPending()); read_buffer_ = io_buffer; expected_read_result_ = buf_len; - reader_->ReadData( - read_buffer_, buf_len, - base::Bind(&AppCacheResponseTest::OnReadComplete, - base::Unretained(this))); + reader_->ReadData(read_buffer_.get(), + buf_len, + base::Bind(&AppCacheResponseTest::OnReadComplete, + base::Unretained(this))); } // AppCacheResponseReader / Writer completion callbacks @@ -309,10 +309,9 @@ class AppCacheResponseTest : public testing::Test { void ReadNonExistentInfo() { EXPECT_FALSE(reader_->IsReadPending()); read_info_buffer_ = new HttpResponseInfoIOBuffer(); - reader_->ReadInfo( - read_info_buffer_, - base::Bind(&AppCacheResponseTest::OnReadInfoComplete, - base::Unretained(this))); + reader_->ReadInfo(read_info_buffer_.get(), + base::Bind(&AppCacheResponseTest::OnReadInfoComplete, + base::Unretained(this))); EXPECT_TRUE(reader_->IsReadPending()); expected_read_result_ = net::ERR_CACHE_MISS; } @@ -320,10 +319,10 @@ class AppCacheResponseTest : public testing::Test { void ReadNonExistentData() { EXPECT_FALSE(reader_->IsReadPending()); read_buffer_ = new IOBuffer(kBlockSize); - reader_->ReadData( - read_buffer_, kBlockSize, - base::Bind(&AppCacheResponseTest::OnReadComplete, - base::Unretained(this))); + reader_->ReadData(read_buffer_.get(), + kBlockSize, + base::Bind(&AppCacheResponseTest::OnReadComplete, + base::Unretained(this))); EXPECT_TRUE(reader_->IsReadPending()); expected_read_result_ = net::ERR_CACHE_MISS; } @@ -499,10 +498,10 @@ class AppCacheResponseTest : public testing::Test { EXPECT_FALSE(reader_->IsReadPending()); read_buffer_ = new IOBuffer(kBlockSize); expected_read_result_ = 0; - reader_->ReadData( - read_buffer_, kBlockSize, - base::Bind(&AppCacheResponseTest::OnReadComplete, - base::Unretained(this))); + reader_->ReadData(read_buffer_.get(), + kBlockSize, + base::Bind(&AppCacheResponseTest::OnReadComplete, + base::Unretained(this))); } void ReadRange() { diff --git a/webkit/appcache/appcache_service.cc b/webkit/appcache/appcache_service.cc index 8dcb5f9..8f955ee 100644 --- a/webkit/appcache/appcache_service.cc +++ b/webkit/appcache/appcache_service.cc @@ -374,8 +374,9 @@ void AppCacheService::CheckResponseHelper::OnGroupLoaded( manifest_url_, group->group_id(), response_id_)); info_buffer_ = new HttpResponseInfoIOBuffer(); response_reader_->ReadInfo( - info_buffer_, base::Bind(&CheckResponseHelper::OnReadInfoComplete, - base::Unretained(this))); + info_buffer_.get(), + base::Bind(&CheckResponseHelper::OnReadInfoComplete, + base::Unretained(this))); } void AppCacheService::CheckResponseHelper::OnReadInfoComplete(int result) { @@ -391,7 +392,8 @@ void AppCacheService::CheckResponseHelper::OnReadInfoComplete(int result) { // Start reading the data. data_buffer_ = new net::IOBuffer(kIOBufferSize); response_reader_->ReadData( - data_buffer_, kIOBufferSize, + data_buffer_.get(), + kIOBufferSize, base::Bind(&CheckResponseHelper::OnReadDataComplete, base::Unretained(this))); } @@ -401,7 +403,8 @@ void AppCacheService::CheckResponseHelper::OnReadDataComplete(int result) { // Keep reading until we've read thru everything or failed to read. amount_data_read_ += result; response_reader_->ReadData( - data_buffer_, kIOBufferSize, + data_buffer_.get(), + kIOBufferSize, base::Bind(&CheckResponseHelper::OnReadDataComplete, base::Unretained(this))); return; @@ -430,7 +433,7 @@ AppCacheService::AppCacheService(quota::QuotaManagerProxy* quota_manager_proxy) quota_manager_proxy_(quota_manager_proxy), request_context_(NULL), force_keep_session_state_(false) { - if (quota_manager_proxy_) { + if (quota_manager_proxy_.get()) { quota_client_ = new AppCacheQuotaClient(this); quota_manager_proxy_->RegisterClient(quota_client_); } diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc index 3ed5d26..43e7f60 100644 --- a/webkit/appcache/appcache_service_unittest.cc +++ b/webkit/appcache/appcache_service_unittest.cc @@ -130,9 +130,9 @@ class AppCacheServiceTest : public testing::Test { AppCacheEntry(AppCacheEntry::MANIFEST, kMockResponseId, kMockInfoSize + kMockBodySize)); cache->set_complete(true); - group->AddCache(cache); - mock_storage()->AddStoredGroup(group); - mock_storage()->AddStoredCache(cache); + group->AddCache(cache.get()); + mock_storage()->AddStoredGroup(group.get()); + mock_storage()->AddStoredCache(cache.get()); } void SetupMockReader( @@ -212,7 +212,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { info_vector.push_back(mock_manifest_2); info_vector.push_back(mock_manifest_3); info->infos_by_origin[kOrigin] = info_vector; - mock_storage()->SimulateGetAllInfo(info); + mock_storage()->SimulateGetAllInfo(info.get()); service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); EXPECT_EQ(0, delete_completion_count_); base::MessageLoop::current()->RunUntilIdle(); @@ -222,7 +222,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { // Should fail if storage fails to delete. info->infos_by_origin[kOrigin] = info_vector; - mock_storage()->SimulateGetAllInfo(info); + mock_storage()->SimulateGetAllInfo(info.get()); mock_storage()->SimulateMakeGroupObsoleteFailure(); service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); EXPECT_EQ(0, delete_completion_count_); diff --git a/webkit/appcache/appcache_storage.cc b/webkit/appcache/appcache_storage.cc index c012f73..8ec9c9a 100644 --- a/webkit/appcache/appcache_storage.cc +++ b/webkit/appcache/appcache_storage.cc @@ -61,8 +61,8 @@ void AppCacheStorage::ResponseInfoLoadTask::StartIfNeeded() { return; reader_.reset( storage_->CreateResponseReader(manifest_url_, group_id_, response_id_)); - reader_->ReadInfo( - info_buffer_, base::Bind(&ResponseInfoLoadTask::OnReadComplete, + reader_->ReadInfo(info_buffer_.get(), + base::Bind(&ResponseInfoLoadTask::OnReadComplete, base::Unretained(this))); } diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc index efe7e73..99df39c 100644 --- a/webkit/appcache/appcache_storage_impl.cc +++ b/webkit/appcache/appcache_storage_impl.cc @@ -102,7 +102,7 @@ void ClearSessionOnlyOrigins( for (origin = origins.begin(); origin != origins.end(); ++origin) { if (!special_storage_policy->IsStorageSessionOnly(*origin)) continue; - if (special_storage_policy && + if (special_storage_policy.get() && special_storage_policy->IsStorageProtected(*origin)) continue; @@ -135,7 +135,7 @@ class AppCacheStorageImpl::DatabaseTask explicit DatabaseTask(AppCacheStorageImpl* storage) : storage_(storage), database_(storage->database_), io_thread_(base::MessageLoopProxy::current()) { - DCHECK(io_thread_); + DCHECK(io_thread_.get()); } void AddDelegate(DelegateReference* delegate_reference) { @@ -369,7 +369,7 @@ void AppCacheStorageImpl::GetAllInfoTask::Run() { void AppCacheStorageImpl::GetAllInfoTask::RunCompleted() { DCHECK(delegates_.size() == 1); - FOR_EACH_DELEGATE(delegates_, OnAllInfo(info_collection_)); + FOR_EACH_DELEGATE(delegates_, OnAllInfo(info_collection_.get())); } // StoreOrLoadTask ------- @@ -513,7 +513,7 @@ void AppCacheStorageImpl::CacheLoadTask::RunCompleted() { DCHECK(cache_record_.cache_id == cache_id_); CreateCacheAndGroupFromRecords(&cache, &group); } - FOR_EACH_DELEGATE(delegates_, OnCacheLoaded(cache, cache_id_)); + FOR_EACH_DELEGATE(delegates_, OnCacheLoaded(cache.get(), cache_id_)); } // GroupLoadTask ------- @@ -557,13 +557,13 @@ void AppCacheStorageImpl::GroupLoadTask::RunCompleted() { CreateCacheAndGroupFromRecords(&cache, &group); } else { group = storage_->working_set_.GetGroup(manifest_url_); - if (!group) { - group = new AppCacheGroup( - storage_, manifest_url_, storage_->NewGroupId()); + if (!group.get()) { + group = + new AppCacheGroup(storage_, manifest_url_, storage_->NewGroupId()); } } } - FOR_EACH_DELEGATE(delegates_, OnGroupLoaded(group, manifest_url_)); + FOR_EACH_DELEGATE(delegates_, OnGroupLoaded(group.get(), manifest_url_)); } // StoreGroupAndCacheTask ------- @@ -752,17 +752,18 @@ void AppCacheStorageImpl::StoreGroupAndCacheTask::RunCompleted() { if (success_) { storage_->UpdateUsageMapAndNotify( group_->manifest_url().GetOrigin(), new_origin_usage_); - if (cache_ != group_->newest_complete_cache()) { + if (cache_.get() != group_->newest_complete_cache()) { cache_->set_complete(true); - group_->AddCache(cache_); + group_->AddCache(cache_.get()); } if (group_->creation_time().is_null()) group_->set_creation_time(group_record_.creation_time); group_->AddNewlyDeletableResponseIds(&newly_deletable_response_ids_); } - FOR_EACH_DELEGATE(delegates_, - OnGroupAndNewestCacheStored(group_, cache_, success_, - would_exceed_quota_)); + FOR_EACH_DELEGATE( + delegates_, + OnGroupAndNewestCacheStored( + group_.get(), cache_.get(), success_, would_exceed_quota_)); group_ = NULL; cache_ = NULL; @@ -1170,10 +1171,10 @@ void AppCacheStorageImpl::MakeGroupObsoleteTask::RunCompleted() { // Also remove from the working set, caches for an 'obsolete' group // may linger in use, but the group itself cannot be looked up by // 'manifest_url' in the working set any longer. - storage_->working_set()->RemoveGroup(group_); + storage_->working_set()->RemoveGroup(group_.get()); } } - FOR_EACH_DELEGATE(delegates_, OnGroupMadeObsolete(group_, success_)); + FOR_EACH_DELEGATE(delegates_, OnGroupMadeObsolete(group_.get(), success_)); group_ = NULL; } @@ -1375,14 +1376,14 @@ void AppCacheStorageImpl::LoadCache(int64 id, Delegate* delegate) { return; } scoped_refptr<CacheLoadTask> task(GetPendingCacheLoadTask(id)); - if (task) { + if (task.get()) { task->AddDelegate(GetOrCreateDelegateReference(delegate)); return; } task = new CacheLoadTask(id, this); task->AddDelegate(GetOrCreateDelegateReference(delegate)); task->Schedule(); - pending_cache_loads_[id] = task; + pending_cache_loads_[id] = task.get(); } void AppCacheStorageImpl::LoadOrCreateGroup( @@ -1404,7 +1405,7 @@ void AppCacheStorageImpl::LoadOrCreateGroup( } scoped_refptr<GroupLoadTask> task(GetPendingGroupLoadTask(manifest_url)); - if (task) { + if (task.get()) { task->AddDelegate(GetOrCreateDelegateReference(delegate)); return; } @@ -1413,7 +1414,7 @@ void AppCacheStorageImpl::LoadOrCreateGroup( // No need to query the database, return a new group immediately. scoped_refptr<AppCacheGroup> group(new AppCacheGroup( service_->storage(), manifest_url, NewGroupId())); - delegate->OnGroupLoaded(group, manifest_url); + delegate->OnGroupLoaded(group.get(), manifest_url); return; } @@ -1780,7 +1781,9 @@ AppCacheDiskCache* AppCacheStorageImpl::disk_cache() { } else { rv = disk_cache_->InitWithDiskBackend( cache_directory_.Append(kDiskCacheDirectoryName), - kMaxDiskCacheSize, false, cache_thread_, + kMaxDiskCacheSize, + false, + cache_thread_.get(), base::Bind(&AppCacheStorageImpl::OnDiskCacheInitialized, base::Unretained(this))); } diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index b3a34e7..7eb88cd 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -187,7 +187,7 @@ class AppCacheStorageImplTest : public testing::Test { notify_storage_modified_count_(0), last_delta_(0), mock_manager_(new MockQuotaManager) { - manager_ = mock_manager_; + manager_ = mock_manager_.get(); } virtual void NotifyStorageAccessed(quota::QuotaClient::ID client_id, @@ -354,7 +354,7 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_LoadCache_Miss() { EXPECT_EQ(111, delegate()->loaded_cache_id_); - EXPECT_FALSE(delegate()->loaded_cache_); + EXPECT_FALSE(delegate()->loaded_cache_.get()); EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_accessed_count_); EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_modified_count_); TestFinished(); @@ -444,7 +444,7 @@ class AppCacheStorageImplTest : public testing::Test { } void Verify_LoadCache_Far_Hit() { - EXPECT_TRUE(delegate()->loaded_cache_); + EXPECT_TRUE(delegate()->loaded_cache_.get()); EXPECT_TRUE(delegate()->loaded_cache_->HasOneRef()); EXPECT_EQ(1, delegate()->loaded_cache_id_); @@ -458,7 +458,7 @@ class AppCacheStorageImplTest : public testing::Test { // Drop things from the working set. delegate()->loaded_cache_ = NULL; - EXPECT_FALSE(delegate()->loaded_group_); + EXPECT_FALSE(delegate()->loaded_group_.get()); // Conduct the group load test, also complete asynchronously. PushNextTask(base::Bind(&AppCacheStorageImplTest::Verify_LoadGroup_Far_Hit, @@ -468,7 +468,7 @@ class AppCacheStorageImplTest : public testing::Test { } void Verify_LoadGroup_Far_Hit() { - EXPECT_TRUE(delegate()->loaded_group_); + EXPECT_TRUE(delegate()->loaded_group_.get()); EXPECT_EQ(kManifestUrl, delegate()->loaded_manifest_url_); EXPECT_TRUE(delegate()->loaded_group_->newest_complete_cache()); delegate()->loaded_groups_newest_cache_ = NULL; @@ -499,7 +499,7 @@ class AppCacheStorageImplTest : public testing::Test { mock_quota_manager_proxy_->mock_manager_->async_ = true; // Conduct the store test. - storage()->StoreGroupAndNewestCache(group_, cache_, delegate()); + storage()->StoreGroupAndNewestCache(group_.get(), cache_.get(), delegate()); EXPECT_FALSE(delegate()->stored_group_success_); } @@ -542,7 +542,8 @@ class AppCacheStorageImplTest : public testing::Test { kDefaultEntrySize + 100)); // Conduct the test. - storage()->StoreGroupAndNewestCache(group_, cache2_, delegate()); + storage()->StoreGroupAndNewestCache( + group_.get(), cache2_.get(), delegate()); EXPECT_FALSE(delegate()->stored_group_success_); } @@ -593,7 +594,7 @@ class AppCacheStorageImplTest : public testing::Test { // Conduct the test. EXPECT_EQ(cache_, group_->newest_complete_cache()); - storage()->StoreGroupAndNewestCache(group_, cache_, delegate()); + storage()->StoreGroupAndNewestCache(group_.get(), cache_.get(), delegate()); EXPECT_FALSE(delegate()->stored_group_success_); } @@ -649,7 +650,7 @@ class AppCacheStorageImplTest : public testing::Test { // and hold a ref to the group to simulate the CacheHost holding that ref. // Conduct the store test. - storage()->StoreGroupAndNewestCache(group_, cache_, delegate()); + storage()->StoreGroupAndNewestCache(group_.get(), cache_.get(), delegate()); EXPECT_FALSE(delegate()->stored_group_success_); // Expected to be async. } @@ -702,7 +703,7 @@ class AppCacheStorageImplTest : public testing::Test { EXPECT_TRUE(database()->InsertOnlineWhiteList(&online_whitelist_record)); // Conduct the test. - storage()->MakeGroupObsolete(group_, delegate()); + storage()->MakeGroupObsolete(group_.get(), delegate()); EXPECT_FALSE(group_->is_obsolete()); } @@ -919,8 +920,12 @@ class AppCacheStorageImplTest : public testing::Test { std::vector<AppCacheDatabase::NamespaceRecord> intercepts; std::vector<AppCacheDatabase::NamespaceRecord> fallbacks; std::vector<AppCacheDatabase::OnlineWhiteListRecord> whitelists; - cache_->ToDatabaseRecords(group_, - &cache_record, &entries, &intercepts, &fallbacks, &whitelists); + cache_->ToDatabaseRecords(group_.get(), + &cache_record, + &entries, + &intercepts, + &fallbacks, + &whitelists); std::vector<AppCacheDatabase::EntryRecord>::const_iterator iter = entries.begin(); @@ -989,8 +994,12 @@ class AppCacheStorageImplTest : public testing::Test { std::vector<AppCacheDatabase::NamespaceRecord> intercepts; std::vector<AppCacheDatabase::NamespaceRecord> fallbacks; std::vector<AppCacheDatabase::OnlineWhiteListRecord> whitelists; - cache_->ToDatabaseRecords(group_, - &cache_record, &entries, &intercepts, &fallbacks, &whitelists); + cache_->ToDatabaseRecords(group_.get(), + &cache_record, + &entries, + &intercepts, + &fallbacks, + &whitelists); std::vector<AppCacheDatabase::EntryRecord>::const_iterator iter = entries.begin(); @@ -1052,8 +1061,12 @@ class AppCacheStorageImplTest : public testing::Test { std::vector<AppCacheDatabase::NamespaceRecord> intercepts; std::vector<AppCacheDatabase::NamespaceRecord> fallbacks; std::vector<AppCacheDatabase::OnlineWhiteListRecord> whitelists; - cache_->ToDatabaseRecords(group_, - &cache_record, &entries, &intercepts, &fallbacks, &whitelists); + cache_->ToDatabaseRecords(group_.get(), + &cache_record, + &entries, + &intercepts, + &fallbacks, + &whitelists); std::vector<AppCacheDatabase::EntryRecord>::const_iterator iter = entries.begin(); @@ -1134,8 +1147,12 @@ class AppCacheStorageImplTest : public testing::Test { std::vector<AppCacheDatabase::NamespaceRecord> intercepts; std::vector<AppCacheDatabase::NamespaceRecord> fallbacks; std::vector<AppCacheDatabase::OnlineWhiteListRecord> whitelists; - cache_->ToDatabaseRecords(group_, - &cache_record, &entries, &intercepts, &fallbacks, &whitelists); + cache_->ToDatabaseRecords(group_.get(), + &cache_record, + &entries, + &intercepts, + &fallbacks, + &whitelists); std::vector<AppCacheDatabase::EntryRecord>::const_iterator iter = entries.begin(); @@ -1465,7 +1482,7 @@ class AppCacheStorageImplTest : public testing::Test { cache_ = new AppCache(storage(), cache_id); cache_->AddEntry(kDefaultEntryUrl, default_entry); cache_->set_complete(true); - group_->AddCache(cache_); + group_->AddCache(cache_.get()); if (add_to_database) { AppCacheDatabase::GroupRecord group_record; group_record.group_id = group_id; diff --git a/webkit/appcache/appcache_storage_unittest.cc b/webkit/appcache/appcache_storage_unittest.cc index 548ecef..181ac7f 100644 --- a/webkit/appcache/appcache_storage_unittest.cc +++ b/webkit/appcache/appcache_storage_unittest.cc @@ -31,13 +31,13 @@ TEST_F(AppCacheStorageTest, AddRemoveCache) { EXPECT_EQ(cache.get(), service.storage()->working_set()->GetCache(111)); - service.storage()->working_set()->RemoveCache(cache); + service.storage()->working_set()->RemoveCache(cache.get()); EXPECT_TRUE(!service.storage()->working_set()->GetCache(111)); // Removing non-existing cache from service should not fail. MockAppCacheService dummy; - dummy.storage()->working_set()->RemoveCache(cache); + dummy.storage()->working_set()->RemoveCache(cache.get()); } TEST_F(AppCacheStorageTest, AddRemoveGroup) { @@ -47,13 +47,13 @@ TEST_F(AppCacheStorageTest, AddRemoveGroup) { EXPECT_EQ(group.get(), service.storage()->working_set()->GetGroup(GURL())); - service.storage()->working_set()->RemoveGroup(group); + service.storage()->working_set()->RemoveGroup(group.get()); EXPECT_TRUE(!service.storage()->working_set()->GetGroup(GURL())); // Removing non-existing group from service should not fail. MockAppCacheService dummy; - dummy.storage()->working_set()->RemoveGroup(group); + dummy.storage()->working_set()->RemoveGroup(group.get()); } TEST_F(AppCacheStorageTest, AddRemoveResponseInfo) { @@ -66,13 +66,13 @@ TEST_F(AppCacheStorageTest, AddRemoveResponseInfo) { EXPECT_EQ(info.get(), service.storage()->working_set()->GetResponseInfo(111)); - service.storage()->working_set()->RemoveResponseInfo(info); + service.storage()->working_set()->RemoveResponseInfo(info.get()); EXPECT_TRUE(!service.storage()->working_set()->GetResponseInfo(111)); // Removing non-existing info from service should not fail. MockAppCacheService dummy; - dummy.storage()->working_set()->RemoveResponseInfo(info); + dummy.storage()->working_set()->RemoveResponseInfo(info.get()); } TEST_F(AppCacheStorageTest, DelegateReferences) { @@ -120,7 +120,7 @@ TEST_F(AppCacheStorageTest, UsageMap) { MockAppCacheService service; scoped_refptr<quota::MockQuotaManagerProxy> mock_proxy( new quota::MockQuotaManagerProxy(NULL, NULL)); - service.set_quota_manager_proxy(mock_proxy); + service.set_quota_manager_proxy(mock_proxy.get()); service.storage()->UpdateUsageMapAndNotify(kOrigin, 0); EXPECT_EQ(0, mock_proxy->notify_storage_modified_count()); diff --git a/webkit/appcache/appcache_test_helper.cc b/webkit/appcache/appcache_test_helper.cc index 4970534..9db65fc 100644 --- a/webkit/appcache/appcache_test_helper.cc +++ b/webkit/appcache/appcache_test_helper.cc @@ -57,8 +57,9 @@ void AppCacheTestHelper::GetOriginsWithCaches(AppCacheService* appcache_service, appcache_info_ = new AppCacheInfoCollection; origins_ = origins; appcache_service->GetAllAppCacheInfo( - appcache_info_, base::Bind(&AppCacheTestHelper::OnGotAppCacheInfo, - base::Unretained(this))); + appcache_info_.get(), + base::Bind(&AppCacheTestHelper::OnGotAppCacheInfo, + base::Unretained(this))); // OnGotAppCacheInfo will quit the message loop. base::MessageLoop::current()->Run(); diff --git a/webkit/appcache/appcache_unittest.cc b/webkit/appcache/appcache_unittest.cc index d097a45..68306c8 100644 --- a/webkit/appcache/appcache_unittest.cc +++ b/webkit/appcache/appcache_unittest.cc @@ -20,7 +20,7 @@ TEST(AppCacheTest, CleanupUnusedCache) { cache->set_complete(true); scoped_refptr<AppCacheGroup> group( new AppCacheGroup(service.storage(), GURL("http://blah/manifest"), 111)); - group->AddCache(cache); + group->AddCache(cache.get()); AppCacheHost host1(1, &frontend, &service); AppCacheHost host2(2, &frontend, &service); @@ -559,9 +559,12 @@ TEST(AppCacheTest, ToFromDatabaseRecords) { std::vector<AppCacheDatabase::NamespaceRecord> intercepts; std::vector<AppCacheDatabase::NamespaceRecord> fallbacks; std::vector<AppCacheDatabase::OnlineWhiteListRecord> whitelists; - cache->ToDatabaseRecords( - group, &cache_record, &entries, - &intercepts, &fallbacks, &whitelists); + cache->ToDatabaseRecords(group.get(), + &cache_record, + &entries, + &intercepts, + &fallbacks, + &whitelists); EXPECT_EQ(kCacheId, cache_record.cache_id); EXPECT_EQ(kGroupId, cache_record.group_id); EXPECT_TRUE(cache_record.online_wildcard); diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc index 3ac4a19..1984f37 100644 --- a/webkit/appcache/appcache_update_job.cc +++ b/webkit/appcache/appcache_update_job.cc @@ -108,8 +108,8 @@ void AppCacheUpdateJob::URLFetcher::Start() { request_->set_first_party_for_cookies(job_->manifest_url_); request_->set_load_flags(request_->load_flags() | net::LOAD_DISABLE_INTERCEPT); - if (existing_response_headers_) - AddConditionalHeaders(existing_response_headers_); + if (existing_response_headers_.get()) + AddConditionalHeaders(existing_response_headers_.get()); request_->Start(); } @@ -152,7 +152,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted( new HttpResponseInfoIOBuffer( new net::HttpResponseInfo(request->response_info()))); response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&URLFetcher::OnWriteComplete, base::Unretained(this))); } else { ReadResponseData(); @@ -170,7 +170,7 @@ void AppCacheUpdateJob::URLFetcher::OnReadCompleted( data_consumed = ConsumeResponseData(bytes_read); if (data_consumed) { bytes_read = 0; - while (request->Read(buffer_, kBufferSize, &bytes_read)) { + while (request->Read(buffer_.get(), kBufferSize, &bytes_read)) { if (bytes_read > 0) { data_consumed = ConsumeResponseData(bytes_read); if (!data_consumed) @@ -225,7 +225,7 @@ void AppCacheUpdateJob::URLFetcher::ReadResponseData() { if (state == CACHE_FAILURE || state == CANCELLED || state == COMPLETED) return; int bytes_read = 0; - request_->Read(buffer_, kBufferSize, &bytes_read); + request_->Read(buffer_.get(), kBufferSize, &bytes_read); OnReadCompleted(request_.get(), bytes_read); } @@ -243,7 +243,8 @@ bool AppCacheUpdateJob::URLFetcher::ConsumeResponseData(int bytes_read) { case MASTER_ENTRY_FETCH: DCHECK(response_writer_.get()); response_writer_->WriteData( - buffer_, bytes_read, + buffer_.get(), + bytes_read, base::Bind(&URLFetcher::OnWriteComplete, base::Unretained(this))); return false; // wait for async write completion to continue reading default: @@ -310,7 +311,7 @@ AppCacheUpdateJob::~AppCacheUpdateJob() { DCHECK(!manifest_fetcher_); DCHECK(pending_url_fetches_.empty()); - DCHECK(!inprogress_cache_); + DCHECK(!inprogress_cache_.get()); DCHECK(pending_master_entries_.empty()); DCHECK(master_entry_fetches_.empty()); @@ -424,7 +425,7 @@ void AppCacheUpdateJob::FetchManifest(bool is_first_fetch) { DCHECK(internal_state_ == REFETCH_MANIFEST); DCHECK(manifest_response_info_.get()); manifest_fetcher_->set_existing_response_headers( - manifest_response_info_->headers); + manifest_response_info_->headers.get()); manifest_fetcher_->Start(); } } @@ -518,7 +519,8 @@ void AppCacheUpdateJob::ContinueHandleManifestFetchCompleted(bool changed) { PendingHosts& hosts = it->second; for (PendingHosts::iterator host_it = hosts.begin(); host_it != hosts.end(); ++host_it) { - (*host_it)->AssociateIncompleteCache(inprogress_cache_, manifest_url_); + (*host_it) + ->AssociateIncompleteCache(inprogress_cache_.get(), manifest_url_); } } @@ -621,8 +623,8 @@ void AppCacheUpdateJob::HandleMasterEntryFetchCompleted( // Section 6.9.4. No update case: step 7.3, else step 22. if (response_code / 100 == 2) { // Add fetched master entry to the appropriate cache. - AppCache* cache = inprogress_cache_ ? inprogress_cache_.get() : - group_->newest_complete_cache(); + AppCache* cache = inprogress_cache_.get() ? inprogress_cache_.get() + : group_->newest_complete_cache(); DCHECK(fetcher->response_writer()); AppCacheEntry master_entry(AppCacheEntry::MASTER, fetcher->response_writer()->response_id(), @@ -633,7 +635,7 @@ void AppCacheUpdateJob::HandleMasterEntryFetchCompleted( duplicate_response_ids_.push_back(master_entry.response_id()); // In no-update case, associate host with the newest cache. - if (!inprogress_cache_) { + if (!inprogress_cache_.get()) { // TODO(michaeln): defer until the updated cache has been stored DCHECK(cache == group_->newest_complete_cache()); for (PendingHosts::iterator host_it = hosts.begin(); @@ -649,7 +651,7 @@ void AppCacheUpdateJob::HandleMasterEntryFetchCompleted( host_notifier.AddHost(host); // In downloading case, disassociate host from inprogress cache. - if (inprogress_cache_) + if (inprogress_cache_.get()) host->AssociateNoCache(GURL()); host->RemoveObserver(this); @@ -663,7 +665,7 @@ void AppCacheUpdateJob::HandleMasterEntryFetchCompleted( // In downloading case, update result is different if all master entries // failed vs. only some failing. - if (inprogress_cache_) { + if (inprogress_cache_.get()) { // Only count successful downloads to know if all master entries failed. pending_master_entries_.erase(found); --master_entries_completed_; @@ -702,7 +704,7 @@ void AppCacheUpdateJob::HandleManifestRefetchCompleted( scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(manifest_response_info_.release())); manifest_response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJob::OnManifestInfoWriteComplete, base::Unretained(this))); } @@ -720,7 +722,8 @@ void AppCacheUpdateJob::OnManifestInfoWriteComplete(int result) { scoped_refptr<net::StringIOBuffer> io_buffer( new net::StringIOBuffer(manifest_data_)); manifest_response_writer_->WriteData( - io_buffer, manifest_data_.length(), + io_buffer.get(), + manifest_data_.length(), base::Bind(&AppCacheUpdateJob::OnManifestDataWriteComplete, base::Unretained(this))); } else { @@ -745,7 +748,7 @@ void AppCacheUpdateJob::StoreGroupAndCache() { DCHECK(stored_state_ == UNSTORED); stored_state_ = STORING; scoped_refptr<AppCache> newest_cache; - if (inprogress_cache_) + if (inprogress_cache_.get()) newest_cache.swap(inprogress_cache_); else newest_cache = group_->newest_complete_cache(); @@ -753,8 +756,8 @@ void AppCacheUpdateJob::StoreGroupAndCache() { // TODO(michaeln): dcheck is fishing for clues to crbug/95101 DCHECK_EQ(manifest_url_, group_->manifest_url()); - service_->storage()->StoreGroupAndNewestCache(group_, newest_cache, - this); // async + service_->storage() + ->StoreGroupAndNewestCache(group_, newest_cache.get(), this); // async } void AppCacheUpdateJob::OnGroupAndNewestCacheStored(AppCacheGroup* group, @@ -813,7 +816,7 @@ void AppCacheUpdateJob::AddAllAssociatedHostsToNotifier( // Collect hosts so we only send one notification per frontend. // A host can only be associated with a single cache so no need to worry // about duplicate hosts being added to the notifier. - if (inprogress_cache_) { + if (inprogress_cache_.get()) { DCHECK(internal_state_ == DOWNLOADING || internal_state_ == CACHE_FAILURE); host_notifier->AddHosts(inprogress_cache_->associated_hosts()); } @@ -860,7 +863,8 @@ void AppCacheUpdateJob::CheckIfManifestChanged() { entry->response_id())); read_manifest_buffer_ = new net::IOBuffer(kBufferSize); manifest_response_reader_->ReadData( - read_manifest_buffer_, kBufferSize, + read_manifest_buffer_.get(), + kBufferSize, base::Bind(&AppCacheUpdateJob::OnManifestDataReadComplete, base::Unretained(this))); // async read } @@ -869,7 +873,8 @@ void AppCacheUpdateJob::OnManifestDataReadComplete(int result) { if (result > 0) { loaded_manifest_data_.append(read_manifest_buffer_->data(), result); manifest_response_reader_->ReadData( - read_manifest_buffer_, kBufferSize, + read_manifest_buffer_.get(), + kBufferSize, base::Bind(&AppCacheUpdateJob::OnManifestDataReadComplete, base::Unretained(this))); // read more } else { @@ -953,7 +958,7 @@ void AppCacheUpdateJob::FetchUrls() { } else { URLFetcher* fetcher = new URLFetcher( url_to_fetch.url, URLFetcher::URL_FETCH, this); - if (url_to_fetch.existing_response_info) { + if (url_to_fetch.existing_response_info.get()) { DCHECK(group_->newest_complete_cache()); AppCacheEntry* existing_entry = group_->newest_complete_cache()->GetEntry(url_to_fetch.url); @@ -961,7 +966,8 @@ void AppCacheUpdateJob::FetchUrls() { DCHECK(existing_entry->response_id() == url_to_fetch.existing_response_info->response_id()); fetcher->set_existing_response_headers( - url_to_fetch.existing_response_info->http_response_info()->headers); + url_to_fetch.existing_response_info->http_response_info()->headers + .get()); fetcher->set_existing_entry(*existing_entry); } fetcher->Start(); @@ -999,9 +1005,9 @@ bool AppCacheUpdateJob::ShouldSkipUrlFetch(const AppCacheEntry& entry) { bool AppCacheUpdateJob::AlreadyFetchedEntry(const GURL& url, int entry_type) { DCHECK(internal_state_ == DOWNLOADING || internal_state_ == NO_UPDATE); - AppCacheEntry* existing = inprogress_cache_ ? - inprogress_cache_->GetEntry(url) : - group_->newest_complete_cache()->GetEntry(url); + AppCacheEntry* existing = + inprogress_cache_.get() ? inprogress_cache_->GetEntry(url) + : group_->newest_complete_cache()->GetEntry(url); if (existing) { existing->add_types(entry_type); return true; @@ -1016,9 +1022,9 @@ void AppCacheUpdateJob::AddMasterEntryToFetchList(AppCacheHost* host, if (internal_state_ == DOWNLOADING || internal_state_ == NO_UPDATE) { AppCache* cache; - if (inprogress_cache_) { + if (inprogress_cache_.get()) { // always associate - host->AssociateIncompleteCache(inprogress_cache_, manifest_url_); + host->AssociateIncompleteCache(inprogress_cache_.get(), manifest_url_); cache = inprogress_cache_.get(); } else { cache = group_->newest_complete_cache(); @@ -1028,7 +1034,7 @@ void AppCacheUpdateJob::AddMasterEntryToFetchList(AppCacheHost* host, AppCacheEntry* entry = cache->GetEntry(url); if (entry) { entry->add_types(AppCacheEntry::MASTER); - if (internal_state_ == NO_UPDATE && !inprogress_cache_) { + if (internal_state_ == NO_UPDATE && !inprogress_cache_.get()) { // only associate if have entry host->AssociateCompleteCache(cache); } @@ -1151,7 +1157,8 @@ void AppCacheUpdateJob::OnResponseInfoLoaded( // Needed response info for a manifest fetch request. if (internal_state_ == FETCH_MANIFEST) { if (http_info) - manifest_fetcher_->set_existing_response_headers(http_info->headers); + manifest_fetcher_->set_existing_response_headers( + http_info->headers.get()); manifest_fetcher_->Start(); return; } @@ -1168,7 +1175,7 @@ void AppCacheUpdateJob::OnResponseInfoLoaded( const std::string name = "vary"; std::string value; void* iter = NULL; - if (!http_info->headers || + if (!http_info->headers.get() || http_info->headers->RequiresValidation(http_info->request_time, http_info->response_time, base::Time::Now()) || @@ -1312,7 +1319,7 @@ void AppCacheUpdateJob::ClearPendingMasterEntries() { void AppCacheUpdateJob::DiscardInprogressCache() { service_->storage()->DoomResponses(manifest_url_, stored_response_ids_); - if (!inprogress_cache_) { + if (!inprogress_cache_.get()) { // We have to undo the changes we made, if any, to the existing cache. for (std::vector<GURL>::iterator iter = added_master_entries_.begin(); iter != added_master_entries_.end(); ++iter) { diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index e6ec588..336ab8d 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -624,7 +624,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), GURL("http://failme"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend mock_frontend; @@ -678,7 +679,8 @@ class AppCacheUpdateJobTest : public testing::Test, AppCacheHost host4(4, &mock_frontend3, service_.get()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; update->StartUpdate(&host4, GURL()); @@ -722,7 +724,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), GURL("http://failme"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -748,7 +751,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), GURL("http://failme"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -790,7 +794,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), GURL("http://testme"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -816,7 +821,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/missing-mime-manifest"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 33); @@ -852,7 +858,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/nosuchfile"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -888,7 +895,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/gone"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -913,7 +921,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/notmodified"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -938,7 +947,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/notmodified"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -974,7 +984,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Create response writer to get a response id. @@ -1007,7 +1018,8 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<net::StringIOBuffer> io_buffer( new net::StringIOBuffer(seed_data)); response_writer_->WriteData( - io_buffer, seed_data.length(), + io_buffer.get(), + seed_data.length(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -1022,7 +1034,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/empty-manifest"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Create a malformed cache with a missing manifest entry. @@ -1069,7 +1082,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), manifest_url, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1096,7 +1110,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), manifest_url, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1121,7 +1136,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Create a response writer to get a response id. @@ -1166,7 +1182,8 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<net::StringIOBuffer> io_buffer( new net::StringIOBuffer(seed_data)); response_writer_->WriteData( - io_buffer, seed_data.length(), + io_buffer.get(), + seed_data.length(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -1180,7 +1197,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -1228,7 +1246,7 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -1242,7 +1260,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -1287,7 +1306,7 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -1301,7 +1320,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -1346,7 +1366,7 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -1360,7 +1380,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/manifest-merged-types"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -1410,7 +1431,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/manifest-with-404"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1435,7 +1457,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/manifest-fb-404"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 99); @@ -1479,7 +1502,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), kManifestUrl, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 25); @@ -1570,7 +1594,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/empty-manifest"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 33); @@ -1613,7 +1638,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/empty-file-manifest"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 22); @@ -1655,7 +1681,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), RetryRequestTestJob::kRetryUrl, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1688,7 +1715,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), RetryRequestTestJob::kRetryUrl, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1722,7 +1750,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), RetryRequestTestJob::kRetryUrl, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1755,7 +1784,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup(service_->storage(), RetryRequestTestJob::kRetryUrl, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1787,7 +1817,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), GURL("http://retryurl"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1816,7 +1847,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -1844,7 +1876,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 11); @@ -1919,7 +1952,7 @@ class AppCacheUpdateJobTest : public testing::Test, tested_manifest_path_override_ = "files/notmodified"; expect_group_obsolete_ = false; expect_group_has_cache_ = true; - expect_newest_cache_ = cache; // unchanged + expect_newest_cache_ = cache.get(); // unchanged MockFrontend::HostIds ids1(1, host->host_id()); frontend->AddExpectedEvent(ids1, ERROR_EVENT); frontend->expected_error_message_ = @@ -1939,7 +1972,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/nosuchfile"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -1973,7 +2007,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), GURL("http://failme"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -2001,7 +2036,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/bad-manifest"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -2029,7 +2065,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/nosuchfile"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -2056,7 +2093,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/manifest-fb-404"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -2088,7 +2126,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend1 = MakeMockFrontend(); @@ -2129,7 +2168,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -2183,7 +2223,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend1 = MakeMockFrontend(); @@ -2230,7 +2271,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -2287,7 +2329,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup(service_->storage(), MockHttpServer::GetMockUrl("files/notmodified"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -2341,7 +2384,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend1 = MakeMockFrontend(); @@ -2427,7 +2471,8 @@ class AppCacheUpdateJobTest : public testing::Test, group_ = new AppCacheGroup( service_->storage(), MockHttpServer::GetMockUrl("files/notmodified"), service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(1, 111); @@ -2508,7 +2553,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; AppCache* cache = MakeCacheForGroup(service_->storage()->NewCacheId(), 42); @@ -2592,7 +2638,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Pretend update job has been running and is about to terminate. @@ -2644,7 +2691,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup( service_->storage(), GURL("http://headertest"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // First test against a cache attempt. Will start manifest fetch @@ -2667,7 +2715,7 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers HttpHeadersRequestTestJob::Initialize(std::string(), std::string()); - update = new AppCacheUpdateJob(service_.get(), group_); + update = new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; group_->update_status_ = AppCacheGroup::DOWNLOADING; update->manifest_response_info_.reset(response_info); @@ -2689,7 +2737,7 @@ class AppCacheUpdateJobTest : public testing::Test, HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", std::string()); - update = new AppCacheUpdateJob(service_.get(), group_); + update = new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; group_->update_status_ = AppCacheGroup::DOWNLOADING; update->manifest_response_info_.reset(response_info); @@ -2716,7 +2764,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Give the newest cache a manifest enry that is in storage. @@ -2757,7 +2806,7 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -2778,7 +2827,8 @@ class AppCacheUpdateJobTest : public testing::Test, service_->storage(), MockHttpServer::GetMockUrl("files/manifest1"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Give the newest cache a manifest enry that is in storage. @@ -2819,7 +2869,7 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info response_writer_->WriteInfo( - io_buffer, + io_buffer.get(), base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, base::Unretained(this))); @@ -2838,7 +2888,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup( service_->storage(), GURL("http://headertest"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Simulate a refetch manifest request that uses an ETag header. @@ -2875,7 +2926,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup( service_->storage(), GURL("http://headertest"), 111); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; // Simulate a refetch manifest request that uses an ETag header. @@ -2908,7 +2960,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup( service_->storage(), manifest_url, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -2935,7 +2988,8 @@ class AppCacheUpdateJobTest : public testing::Test, MakeService(); group_ = new AppCacheGroup( service_->storage(), manifest_url, service_->storage()->NewGroupId()); - AppCacheUpdateJob* update = new AppCacheUpdateJob(service_.get(), group_); + AppCacheUpdateJob* update = + new AppCacheUpdateJob(service_.get(), group_.get()); group_->update_job_ = update; MockFrontend* frontend = MakeMockFrontend(); @@ -3031,7 +3085,7 @@ class AppCacheUpdateJobTest : public testing::Test, new AppCacheResponseInfo(service_.get(), manifest_url, response_id, http_info, 0)); response_infos_.push_back(info); - return info; + return info.get(); } MockFrontend* MakeMockFrontend() { @@ -3073,7 +3127,7 @@ class AppCacheUpdateJobTest : public testing::Test, // when update succeeds. MockAppCacheStorage* storage = reinterpret_cast<MockAppCacheStorage*>(service_->storage()); - EXPECT_TRUE(storage->IsGroupStored(group_)); + EXPECT_TRUE(storage->IsGroupStored(group_.get())); EXPECT_TRUE(storage->IsCacheStored(group_->newest_complete_cache())); // Check that all entries in the newest cache were stored. @@ -3366,7 +3420,7 @@ TEST_F(AppCacheUpdateJobTest, AlreadyChecking) { new AppCacheGroup(service.storage(), GURL("http://manifesturl.com"), service.storage()->NewGroupId())); - AppCacheUpdateJob update(&service, group); + AppCacheUpdateJob update(&service, group.get()); // Pretend group is in checking state. group->update_job_ = &update; @@ -3394,7 +3448,7 @@ TEST_F(AppCacheUpdateJobTest, AlreadyDownloading) { new AppCacheGroup(service.storage(), GURL("http://manifesturl.com"), service.storage()->NewGroupId())); - AppCacheUpdateJob update(&service, group); + AppCacheUpdateJob update(&service, group.get()); // Pretend group is in downloading state. group->update_job_ = &update; diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc index 704e0ea..fc114b3 100644 --- a/webkit/appcache/appcache_url_request_job.cc +++ b/webkit/appcache/appcache_url_request_job.cc @@ -159,7 +159,7 @@ void AppCacheURLRequestJob::OnResponseInfoLoaded( } const net::HttpResponseInfo* AppCacheURLRequestJob::http_info() const { - if (!info_) + if (!info_.get()) return NULL; if (range_response_info_) return range_response_info_.get(); @@ -191,7 +191,7 @@ void AppCacheURLRequestJob::SetupRangeResponse() { const char kPartialStatusLine[] = "HTTP/1.1 206 Partial Content"; range_response_info_.reset( new net::HttpResponseInfo(*info_->http_response_info())); - net::HttpResponseHeaders* headers = range_response_info_->headers; + net::HttpResponseHeaders* headers = range_response_info_->headers.get(); headers->RemoveHeader(kLengthHeader); headers->RemoveHeader(kRangeHeader); headers->ReplaceStatusLine(kPartialStatusLine); @@ -248,7 +248,7 @@ net::LoadState AppCacheURLRequestJob::GetLoadState() const { return net::LOAD_STATE_WAITING_FOR_APPCACHE; if (delivery_type_ != APPCACHED_DELIVERY) return net::LOAD_STATE_IDLE; - if (!info_) + if (!info_.get()) return net::LOAD_STATE_WAITING_FOR_APPCACHE; if (reader_.get() && reader_->IsReadPending()) return net::LOAD_STATE_READING_RESPONSE; diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc index ec0ca46..052584f 100644 --- a/webkit/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/appcache/appcache_url_request_job_unittest.cc @@ -111,7 +111,8 @@ class AppCacheURLRequestJobTest : public testing::Test { scoped_refptr<IOBuffer> wrapped_buffer( new net::WrappedIOBuffer(received_data_->data() + amount_received_)); int bytes_read = 0; - EXPECT_FALSE(request->Read(wrapped_buffer, kBlockSize, &bytes_read)); + EXPECT_FALSE( + request->Read(wrapped_buffer.get(), kBlockSize, &bytes_read)); EXPECT_EQ(0, bytes_read); } @@ -252,8 +253,8 @@ class AppCacheURLRequestJobTest : public testing::Test { void WriteBasicResponse() { scoped_refptr<IOBuffer> body(new WrappedIOBuffer(kHttpBasicBody)); std::string raw_headers(kHttpBasicHeaders, arraysize(kHttpBasicHeaders)); - WriteResponse(MakeHttpResponseInfo(raw_headers), body, - strlen(kHttpBasicBody)); + WriteResponse( + MakeHttpResponseInfo(raw_headers), body.get(), strlen(kHttpBasicBody)); } void WriteResponse(net::HttpResponseInfo* head, @@ -270,7 +271,7 @@ class AppCacheURLRequestJobTest : public testing::Test { expected_write_result_ = GetHttpResponseInfoSize(head); write_info_buffer_ = new HttpResponseInfoIOBuffer(head); writer_->WriteInfo( - write_info_buffer_, + write_info_buffer_.get(), base::Bind(&AppCacheURLRequestJobTest::OnWriteInfoComplete, base::Unretained(this))); } @@ -279,20 +280,20 @@ class AppCacheURLRequestJobTest : public testing::Test { EXPECT_FALSE(writer_->IsWritePending()); write_buffer_ = io_buffer; expected_write_result_ = buf_len; - writer_->WriteData( - write_buffer_, buf_len, - base::Bind(&AppCacheURLRequestJobTest::OnWriteComplete, - base::Unretained(this))); + writer_->WriteData(write_buffer_.get(), + buf_len, + base::Bind(&AppCacheURLRequestJobTest::OnWriteComplete, + base::Unretained(this))); } void ReadResponseBody(scoped_refptr<IOBuffer> io_buffer, int buf_len) { EXPECT_FALSE(reader_->IsReadPending()); read_buffer_ = io_buffer; expected_read_result_ = buf_len; - reader_->ReadData( - read_buffer_, buf_len, - base::Bind(&AppCacheURLRequestJobTest::OnReadComplete, - base::Unretained(this))); + reader_->ReadData(read_buffer_.get(), + buf_len, + base::Bind(&AppCacheURLRequestJobTest::OnReadComplete, + base::Unretained(this))); } // AppCacheResponseReader / Writer completion callbacks @@ -543,7 +544,7 @@ class AppCacheURLRequestJobTest : public testing::Test { // Start the request. EXPECT_FALSE(job->has_been_started()); - mock_factory_job_ = job; + mock_factory_job_ = job.get(); request_->Start(); EXPECT_FALSE(mock_factory_job_); EXPECT_TRUE(job->has_been_started()); @@ -602,7 +603,8 @@ class AppCacheURLRequestJobTest : public testing::Test { for (int i = 0; i < 3; ++i, p += kBlockSize) FillData(i + 1, p, kBlockSize); std::string raw_headers(kHttpHeaders, arraysize(kHttpHeaders)); - WriteResponse(MakeHttpResponseInfo(raw_headers), body, kBlockSize * 3); + WriteResponse( + MakeHttpResponseInfo(raw_headers), body.get(), kBlockSize * 3); } void VerifyDeliverLargeAppCachedResponse() { @@ -656,7 +658,7 @@ class AppCacheURLRequestJobTest : public testing::Test { // Start the request. EXPECT_FALSE(job->has_been_started()); - mock_factory_job_ = job; + mock_factory_job_ = job.get(); request_->Start(); EXPECT_FALSE(mock_factory_job_); EXPECT_TRUE(job->has_been_started()); diff --git a/webkit/appcache/mock_appcache_storage.cc b/webkit/appcache/mock_appcache_storage.cc index e808d1b..27c974d 100644 --- a/webkit/appcache/mock_appcache_storage.cc +++ b/webkit/appcache/mock_appcache_storage.cc @@ -181,7 +181,7 @@ void MockAppCacheStorage::DeleteResponses( void MockAppCacheStorage::ProcessGetAllInfo( scoped_refptr<DelegateReference> delegate_ref) { if (delegate_ref->delegate) - delegate_ref->delegate->OnAllInfo(simulated_appcache_info_); + delegate_ref->delegate->OnAllInfo(simulated_appcache_info_.get()); } void MockAppCacheStorage::ProcessLoadCache( @@ -197,11 +197,11 @@ void MockAppCacheStorage::ProcessLoadOrCreateGroup( // Newly created groups are not put in the stored_groups collection // until StoreGroupAndNewestCache is called. - if (!group) + if (!group.get()) group = new AppCacheGroup(service_->storage(), manifest_url, NewGroupId()); if (delegate_ref->delegate) - delegate_ref->delegate->OnGroupLoaded(group, manifest_url); + delegate_ref->delegate->OnGroupLoaded(group.get(), manifest_url); } void MockAppCacheStorage::ProcessStoreGroupAndNewestCache( @@ -211,15 +211,16 @@ void MockAppCacheStorage::ProcessStoreGroupAndNewestCache( Delegate* delegate = delegate_ref->delegate; if (simulate_store_group_and_newest_cache_failure_) { if (delegate) - delegate->OnGroupAndNewestCacheStored(group, newest_cache, false, false); + delegate->OnGroupAndNewestCacheStored( + group.get(), newest_cache.get(), false, false); return; } - AddStoredGroup(group); - if (newest_cache != group->newest_complete_cache()) { + AddStoredGroup(group.get()); + if (newest_cache.get() != group->newest_complete_cache()) { newest_cache->set_complete(true); - group->AddCache(newest_cache); - AddStoredCache(newest_cache); + group->AddCache(newest_cache.get()); + AddStoredCache(newest_cache.get()); // Copy the collection prior to removal, on final release // of a cache the group's collection will change. @@ -228,7 +229,8 @@ void MockAppCacheStorage::ProcessStoreGroupAndNewestCache( } if (delegate) - delegate->OnGroupAndNewestCacheStored(group, newest_cache, true, false); + delegate->OnGroupAndNewestCacheStored( + group.get(), newest_cache.get(), true, false); } namespace { @@ -416,11 +418,11 @@ void MockAppCacheStorage::ProcessMakeGroupObsolete( scoped_refptr<DelegateReference> delegate_ref) { if (simulate_make_group_obsolete_failure_) { if (delegate_ref->delegate) - delegate_ref->delegate->OnGroupMadeObsolete(group, false); + delegate_ref->delegate->OnGroupMadeObsolete(group.get(), false); return; } - RemoveStoredGroup(group); + RemoveStoredGroup(group.get()); if (group->newest_complete_cache()) RemoveStoredCache(group->newest_complete_cache()); @@ -434,10 +436,10 @@ void MockAppCacheStorage::ProcessMakeGroupObsolete( // Also remove from the working set, caches for an 'obsolete' group // may linger in use, but the group itself cannot be looked up by // 'manifest_url' in the working set any longer. - working_set()->RemoveGroup(group); + working_set()->RemoveGroup(group.get()); if (delegate_ref->delegate) - delegate_ref->delegate->OnGroupMadeObsolete(group, true); + delegate_ref->delegate->OnGroupMadeObsolete(group.get(), true); } void MockAppCacheStorage::ScheduleTask(const base::Closure& task) { diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc index 008d0de..0f17b75 100644 --- a/webkit/appcache/mock_appcache_storage_unittest.cc +++ b/webkit/appcache/mock_appcache_storage_unittest.cc @@ -89,7 +89,7 @@ TEST_F(MockAppCacheStorageTest, LoadCache_Miss) { EXPECT_NE(111, delegate.loaded_cache_id_); base::MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(111, delegate.loaded_cache_id_); - EXPECT_FALSE(delegate.loaded_cache_); + EXPECT_FALSE(delegate.loaded_cache_.get()); } TEST_F(MockAppCacheStorageTest, LoadCache_NearHit) { @@ -171,9 +171,9 @@ TEST_F(MockAppCacheStorageTest, LoadGroupAndCache_FarHit) { int64 cache_id = storage->NewCacheId(); scoped_refptr<AppCache> cache(new AppCache(service.storage(), cache_id)); cache->set_complete(true); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Drop the references from above so the only refs to these // objects are from within the storage class. This is to make @@ -228,7 +228,7 @@ TEST_F(MockAppCacheStorageTest, StoreNewGroup) { MockStorageDelegate delegate; EXPECT_TRUE(storage->stored_caches_.empty()); EXPECT_TRUE(storage->stored_groups_.empty()); - storage->StoreGroupAndNewestCache(group, cache, &delegate); + storage->StoreGroupAndNewestCache(group.get(), cache.get(), &delegate); EXPECT_FALSE(delegate.stored_group_success_); EXPECT_TRUE(storage->stored_caches_.empty()); EXPECT_TRUE(storage->stored_groups_.empty()); @@ -255,9 +255,9 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) { scoped_refptr<AppCache> old_cache( new AppCache(service.storage(), old_cache_id)); old_cache->set_complete(true); - group->AddCache(old_cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(old_cache); + group->AddCache(old_cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(old_cache.get()); int64 new_cache_id = storage->NewCacheId(); scoped_refptr<AppCache> new_cache( new AppCache(service.storage(), new_cache_id)); @@ -267,20 +267,20 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) { MockStorageDelegate delegate; EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - EXPECT_TRUE(storage->IsCacheStored(old_cache)); - EXPECT_FALSE(storage->IsCacheStored(new_cache)); - storage->StoreGroupAndNewestCache(group, new_cache, &delegate); + EXPECT_TRUE(storage->IsCacheStored(old_cache.get())); + EXPECT_FALSE(storage->IsCacheStored(new_cache.get())); + storage->StoreGroupAndNewestCache(group.get(), new_cache.get(), &delegate); EXPECT_FALSE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - EXPECT_TRUE(storage->IsCacheStored(old_cache)); - EXPECT_FALSE(storage->IsCacheStored(new_cache)); + EXPECT_TRUE(storage->IsCacheStored(old_cache.get())); + EXPECT_FALSE(storage->IsCacheStored(new_cache.get())); base::MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_TRUE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - EXPECT_FALSE(storage->IsCacheStored(old_cache)); - EXPECT_TRUE(storage->IsCacheStored(new_cache)); + EXPECT_FALSE(storage->IsCacheStored(old_cache.get())); + EXPECT_TRUE(storage->IsCacheStored(new_cache.get())); EXPECT_EQ(new_cache.get(), group->newest_complete_cache()); EXPECT_TRUE(new_cache->is_complete()); } @@ -299,9 +299,9 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroupExistingCache) { int64 cache_id = storage->NewCacheId(); scoped_refptr<AppCache> cache(new AppCache(service.storage(), cache_id)); cache->set_complete(true); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Hold our refs to simulate the UpdateJob holding these refs. // Change the group's newest cache. @@ -313,8 +313,8 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroupExistingCache) { MockStorageDelegate delegate; EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - EXPECT_TRUE(storage->IsCacheStored(cache)); - storage->StoreGroupAndNewestCache(group, cache, &delegate); + EXPECT_TRUE(storage->IsCacheStored(cache.get())); + storage->StoreGroupAndNewestCache(group.get(), cache.get(), &delegate); EXPECT_FALSE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); @@ -322,7 +322,7 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroupExistingCache) { EXPECT_TRUE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - EXPECT_TRUE(storage->IsCacheStored(cache)); + EXPECT_TRUE(storage->IsCacheStored(cache.get())); EXPECT_EQ(cache, group->newest_complete_cache()); EXPECT_TRUE(cache->GetEntry(entry_url)); } @@ -341,9 +341,9 @@ TEST_F(MockAppCacheStorageTest, MakeGroupObsolete) { int64 cache_id = storage->NewCacheId(); scoped_refptr<AppCache> cache(new AppCache(service.storage(), cache_id)); cache->set_complete(true); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Hold our refs to simulate the UpdateJob holding these refs. // Conduct the test. @@ -353,7 +353,7 @@ TEST_F(MockAppCacheStorageTest, MakeGroupObsolete) { EXPECT_EQ(size_t(1), storage->stored_groups_.size()); EXPECT_FALSE(cache->HasOneRef()); EXPECT_FALSE(group->HasOneRef()); - storage->MakeGroupObsolete(group, &delegate); + storage->MakeGroupObsolete(group.get(), &delegate); EXPECT_FALSE(group->is_obsolete()); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); @@ -432,9 +432,9 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainResponse) { cache->set_complete(true); scoped_refptr<AppCacheGroup> group( new AppCacheGroup(service.storage(), kManifestUrl, 111)); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Conduct the test. MockStorageDelegate delegate; @@ -485,9 +485,9 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainFallbackResponse) { scoped_refptr<AppCacheGroup> group( new AppCacheGroup(service.storage(), kManifestUrl, 111)); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // The test url is in both fallback namespace urls, but should match // the longer of the two. @@ -532,9 +532,9 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseWithMultipleCandidates) { cache->set_complete(true); scoped_refptr<AppCacheGroup> group( new AppCacheGroup(service.storage(), kManifestUrl1, 111)); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Drop our references to cache1 so it appears as "not in use". cache = NULL; group = NULL; @@ -545,9 +545,9 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseWithMultipleCandidates) { kEntryUrl, AppCacheEntry(AppCacheEntry::EXPLICIT, kResponseId2)); cache->set_complete(true); group = new AppCacheGroup(service.storage(), kManifestUrl2, 222); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); // Conduct the test, we should find the response from the second cache // since it's "in use". @@ -592,9 +592,9 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { cache->set_complete(true); scoped_refptr<AppCacheGroup> group( new AppCacheGroup(service.storage(), kManifestUrl, 111)); - group->AddCache(cache); - storage->AddStoredGroup(group); - storage->AddStoredCache(cache); + group->AddCache(cache.get()); + storage->AddStoredGroup(group.get()); + storage->AddStoredCache(cache.get()); MockStorageDelegate delegate; diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc index 1cff8e1..9c207d0 100644 --- a/webkit/appcache/view_appcache_internals_job.cc +++ b/webkit/appcache/view_appcache_internals_job.cc @@ -335,8 +335,9 @@ class MainPageJob : public BaseInternalsJob { DCHECK(request_); info_collection_ = new AppCacheInfoCollection; appcache_service_->GetAllAppCacheInfo( - info_collection_, base::Bind(&MainPageJob::OnGotInfoComplete, - weak_factory_.GetWeakPtr())); + info_collection_.get(), + base::Bind(&MainPageJob::OnGotInfoComplete, + weak_factory_.GetWeakPtr())); } // Produces a page containing the listing @@ -349,7 +350,7 @@ class MainPageJob : public BaseInternalsJob { out->clear(); EmitPageStart(out); - if (!info_collection_) { + if (!info_collection_.get()) { out->append(kErrorMessage); } else if (info_collection_->infos_by_origin.empty()) { out->append(kEmptyAppCachesMessage); @@ -548,15 +549,18 @@ class ViewEntryJob : public BaseInternalsJob, EmitPageStart(out); EmitAnchor(entry_url_.spec(), entry_url_.spec(), out); out->append("<br/>\n"); - if (response_info_) { + if (response_info_.get()) { if (response_info_->http_response_info()) - EmitResponseHeaders(response_info_->http_response_info()->headers, out); + EmitResponseHeaders(response_info_->http_response_info()->headers.get(), + out); else out->append("Failed to read response headers.<br>"); - if (response_data_) { - EmitHexDump(response_data_->data(), amount_read_, - response_info_->response_data_size(), out); + if (response_data_.get()) { + EmitHexDump(response_data_->data(), + amount_read_, + response_info_->response_data_size(), + out); } else { out->append("Failed to read response data.<br>"); } @@ -589,7 +593,8 @@ class ViewEntryJob : public BaseInternalsJob, reader_.reset(appcache_service_->storage()->CreateResponseReader( manifest_url_, group_id_, response_id_)); reader_->ReadData( - response_data_, amount_to_read, + response_data_.get(), + amount_to_read, base::Bind(&ViewEntryJob::OnReadComplete, base::Unretained(this))); } diff --git a/webkit/browser/blob/blob_storage_context.cc b/webkit/browser/blob/blob_storage_context.cc index da261e6..03acc8b 100644 --- a/webkit/browser/blob/blob_storage_context.cc +++ b/webkit/browser/blob/blob_storage_context.cc @@ -66,8 +66,8 @@ scoped_ptr<BlobDataHandle> BlobStorageContext::GetBlobDataFromUUID( if (found->second.flags & EXCEEDED_MEMORY) return result.Pass(); DCHECK(!(found->second.flags & BEING_BUILT)); - result.reset(new BlobDataHandle(found->second.data, this, - base::MessageLoopProxy::current())); + result.reset(new BlobDataHandle( + found->second.data.get(), this, base::MessageLoopProxy::current())); return result.Pass(); } @@ -107,7 +107,7 @@ void BlobStorageContext::AppendBlobDataItem( return; if (found->second.flags & EXCEEDED_MEMORY) return; - BlobData* target_blob_data = found->second.data; + BlobData* target_blob_data = found->second.data.get(); DCHECK(target_blob_data); bool exceeded_memory = false; @@ -292,8 +292,8 @@ void BlobStorageContext::AppendFileItem( // It may be a temporary file that should be deleted when no longer needed. scoped_refptr<ShareableFileReference> shareable_file = ShareableFileReference::Get(file_path); - if (shareable_file) - target_blob_data->AttachShareableFileReference(shareable_file); + if (shareable_file.get()) + target_blob_data->AttachShareableFileReference(shareable_file.get()); } void BlobStorageContext::AppendFileSystemFileItem( diff --git a/webkit/browser/blob/blob_storage_context_unittest.cc b/webkit/browser/blob/blob_storage_context_unittest.cc index ef24bdc..b2a0a6d 100644 --- a/webkit/browser/blob/blob_storage_context_unittest.cc +++ b/webkit/browser/blob/blob_storage_context_unittest.cc @@ -121,14 +121,14 @@ TEST(BlobStorageContextTest, CompoundBlobs) { scoped_ptr<BlobDataHandle> blob_data_handle; // Test a blob referring to only data and a file. - blob_data_handle = context.AddFinishedBlob(blob_data1); + blob_data_handle = context.AddFinishedBlob(blob_data1.get()); ASSERT_TRUE(blob_data_handle.get()); - EXPECT_TRUE(*(blob_data_handle->data()) == *blob_data1); + EXPECT_TRUE(*(blob_data_handle->data()) == *blob_data1.get()); // Test a blob composed in part with another blob. - blob_data_handle = context.AddFinishedBlob(blob_data2); + blob_data_handle = context.AddFinishedBlob(blob_data2.get()); ASSERT_TRUE(blob_data_handle.get()); - EXPECT_TRUE(*(blob_data_handle->data()) == *canonicalized_blob_data2); + EXPECT_TRUE(*(blob_data_handle->data()) == *canonicalized_blob_data2.get()); } TEST(BlobStorageContextTest, PublicBlobUrls) { diff --git a/webkit/browser/blob/blob_storage_controller.cc b/webkit/browser/blob/blob_storage_controller.cc index d7062c4..5c0fe15 100644 --- a/webkit/browser/blob/blob_storage_controller.cc +++ b/webkit/browser/blob/blob_storage_controller.cc @@ -54,7 +54,7 @@ void BlobStorageController::AppendBlobDataItem( BlobMap::iterator found = unfinalized_blob_map_.find(url.spec()); if (found == unfinalized_blob_map_.end()) return; - BlobData* target_blob_data = found->second; + BlobData* target_blob_data = found->second.get(); DCHECK(target_blob_data); memory_usage_ -= target_blob_data->GetMemoryUsage(); @@ -163,7 +163,7 @@ bool BlobStorageController::RemoveFromMapHelper( BlobMap::iterator found = map->find(url.spec()); if (found == map->end()) return false; - if (DecrementBlobDataUsage(found->second)) + if (DecrementBlobDataUsage(found->second.get())) memory_usage_ -= found->second->GetMemoryUsage(); map->erase(found); return true; @@ -229,8 +229,8 @@ void BlobStorageController::AppendFileItem( // It may be a temporary file that should be deleted when no longer needed. scoped_refptr<ShareableFileReference> shareable_file = ShareableFileReference::Get(file_path); - if (shareable_file) - target_blob_data->AttachShareableFileReference(shareable_file); + if (shareable_file.get()) + target_blob_data->AttachShareableFileReference(shareable_file.get()); } void BlobStorageController::AppendFileSystemFileItem( diff --git a/webkit/browser/blob/blob_storage_controller_unittest.cc b/webkit/browser/blob/blob_storage_controller_unittest.cc index 180f787..5c675f7 100644 --- a/webkit/browser/blob/blob_storage_controller_unittest.cc +++ b/webkit/browser/blob/blob_storage_controller_unittest.cc @@ -44,21 +44,21 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) { // Test registering a blob URL referring to the blob data containing only // data and file. GURL blob_url1("blob://url_1"); - blob_storage_controller.AddFinishedBlob(blob_url1, blob_data1); + blob_storage_controller.AddFinishedBlob(blob_url1, blob_data1.get()); BlobData* blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url1); ASSERT_TRUE(blob_data_found != NULL); - EXPECT_TRUE(*blob_data_found == *blob_data1); + EXPECT_TRUE(*blob_data_found == *blob_data1.get()); // Test registering a blob URL referring to the blob data containing data, // file and blob. GURL blob_url2("blob://url_2"); - blob_storage_controller.AddFinishedBlob(blob_url2, blob_data2); + blob_storage_controller.AddFinishedBlob(blob_url2, blob_data2.get()); blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url2); ASSERT_TRUE(blob_data_found != NULL); - EXPECT_TRUE(*blob_data_found == *canonicalized_blob_data2); + EXPECT_TRUE(*blob_data_found == *canonicalized_blob_data2.get()); // Test registering a blob URL referring to existent blob URL. GURL blob_url3("blob://url_3"); @@ -66,7 +66,7 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) { blob_data_found = blob_storage_controller.GetBlobDataFromUrl(blob_url3); ASSERT_TRUE(blob_data_found != NULL); - EXPECT_TRUE(*blob_data_found == *blob_data1); + EXPECT_TRUE(*blob_data_found == *blob_data1.get()); // Test unregistering a blob URL. blob_storage_controller.RemoveBlob(blob_url3); diff --git a/webkit/browser/blob/blob_url_request_job.cc b/webkit/browser/blob/blob_url_request_job.cc index 27d6686..66d9c42 100644 --- a/webkit/browser/blob/blob_url_request_job.cc +++ b/webkit/browser/blob/blob_url_request_job.cc @@ -80,7 +80,7 @@ BlobURLRequestJob::BlobURLRequestJob( error_(false), headers_set_(false), byte_range_set_(false) { - DCHECK(file_thread_proxy_); + DCHECK(file_thread_proxy_.get()); } void BlobURLRequestJob::Start() { @@ -121,7 +121,7 @@ bool BlobURLRequestJob::ReadRawData(net::IOBuffer* dest, } // Keep track of the buffer. - DCHECK(!read_buf_); + DCHECK(!read_buf_.get()); read_buf_ = new net::DrainableIOBuffer(dest, dest_size); return ReadLoop(bytes_read); @@ -178,7 +178,7 @@ void BlobURLRequestJob::DidStart() { } // If the blob data is not present, bail out. - if (!blob_data_) { + if (!blob_data_.get()) { NotifyFailure(net::ERR_FILE_NOT_FOUND); return; } @@ -392,9 +392,9 @@ bool BlobURLRequestJob::ReadFileItem(FileStreamReader* reader, DCHECK_GE(read_buf_->BytesRemaining(), bytes_to_read); DCHECK(reader); const int result = reader->Read( - read_buf_, bytes_to_read, - base::Bind(&BlobURLRequestJob::DidReadFile, - base::Unretained(this))); + read_buf_.get(), + bytes_to_read, + base::Bind(&BlobURLRequestJob::DidReadFile, base::Unretained(this))); if (result >= 0) { // Data is immediately available. if (GetStatus().is_io_pending()) @@ -585,11 +585,10 @@ void BlobURLRequestJob::CreateFileStreamReader(size_t index, FileStreamReader* reader = NULL; switch (item.type()) { case BlobData::Item::TYPE_FILE: - reader = new LocalFileStreamReader( - file_thread_proxy_, - item.path(), - item.offset() + additional_offset, - item.expected_modification_time()); + reader = new LocalFileStreamReader(file_thread_proxy_.get(), + item.path(), + item.offset() + additional_offset, + item.expected_modification_time()); break; case BlobData::Item::TYPE_FILE_FILESYSTEM: reader = file_system_context_->CreateFileStreamReader( diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc index 1e915e4..d30049a 100644 --- a/webkit/browser/blob/blob_url_request_job_factory.cc +++ b/webkit/browser/blob/blob_url_request_job_factory.cc @@ -23,8 +23,8 @@ BlobProtocolHandler::BlobProtocolHandler( file_system_context_(file_system_context), file_loop_proxy_(loop_proxy) { DCHECK(blob_storage_controller_); - DCHECK(file_system_context_); - DCHECK(file_loop_proxy_); + DCHECK(file_system_context_.get()); + DCHECK(file_loop_proxy_.get()); } BlobProtocolHandler::~BlobProtocolHandler() {} @@ -32,12 +32,15 @@ BlobProtocolHandler::~BlobProtocolHandler() {} net::URLRequestJob* BlobProtocolHandler::MaybeCreateJob( net::URLRequest* request, net::NetworkDelegate* network_delegate) const { scoped_refptr<webkit_blob::BlobData> data = LookupBlobData(request); - if (!data) { + if (!data.get()) { // This request is not coming through resource dispatcher host. data = blob_storage_controller_->GetBlobDataFromUrl(request->url()); } - return new webkit_blob::BlobURLRequestJob( - request, network_delegate, data, file_system_context_, file_loop_proxy_); + return new webkit_blob::BlobURLRequestJob(request, + network_delegate, + data.get(), + file_system_context_.get(), + file_loop_proxy_.get()); } scoped_refptr<webkit_blob::BlobData> diff --git a/webkit/browser/blob/blob_url_request_job_unittest.cc b/webkit/browser/blob/blob_url_request_job_unittest.cc index d580f97..90bd261 100644 --- a/webkit/browser/blob/blob_url_request_job_unittest.cc +++ b/webkit/browser/blob/blob_url_request_job_unittest.cc @@ -123,8 +123,8 @@ class BlobURLRequestJobTest : public testing::Test { net::NetworkDelegate* network_delegate) const OVERRIDE { return new BlobURLRequestJob(request, network_delegate, - test_->blob_data_, - test_->file_system_context_, + test_->blob_data_.get(), + test_->file_system_context_.get(), base::MessageLoopProxy::current()); } @@ -207,7 +207,7 @@ class BlobURLRequestJobTest : public testing::Test { fileapi::FileSystemFileUtil* file_util = file_system_context_->GetFileUtil(kFileSystemType); - fileapi::FileSystemOperationContext context(file_system_context_); + fileapi::FileSystemOperationContext context(file_system_context_.get()); context.set_allowed_bytes_growth(1024); base::PlatformFile handle = base::kInvalidPlatformFileValue; diff --git a/webkit/browser/blob/local_file_stream_reader.cc b/webkit/browser/blob/local_file_stream_reader.cc index 5c13de4..a550016 100644 --- a/webkit/browser/blob/local_file_stream_reader.cc +++ b/webkit/browser/blob/local_file_stream_reader.cc @@ -60,9 +60,11 @@ int LocalFileStreamReader::Read(net::IOBuffer* buf, int buf_len, int64 LocalFileStreamReader::GetLength( const net::Int64CompletionCallback& callback) { const bool posted = base::FileUtilProxy::GetFileInfo( - task_runner_, file_path_, + task_runner_.get(), + file_path_, base::Bind(&LocalFileStreamReader::DidGetFileInfoForGetLength, - weak_factory_.GetWeakPtr(), callback)); + weak_factory_.GetWeakPtr(), + callback)); DCHECK(posted); return net::ERR_IO_PENDING; } diff --git a/webkit/browser/blob/local_file_stream_reader_unittest.cc b/webkit/browser/blob/local_file_stream_reader_unittest.cc index e36b123..f575653 100644 --- a/webkit/browser/blob/local_file_stream_reader_unittest.cc +++ b/webkit/browser/blob/local_file_stream_reader_unittest.cc @@ -36,7 +36,7 @@ void ReadFromReader(LocalFileStreamReader* reader, while (total_bytes_read < size) { scoped_refptr<net::IOBufferWithSize> buf( new net::IOBufferWithSize(size - total_bytes_read)); - int rv = reader->Read(buf, buf->size(), callback.callback()); + int rv = reader->Read(buf.get(), buf->size(), callback.callback()); if (rv == net::ERR_IO_PENDING) rv = callback.WaitForResult(); if (rv < 0) @@ -249,7 +249,7 @@ TEST_F(LocalFileStreamReaderTest, DeleteWithUnfinishedRead) { net::TestCompletionCallback callback; scoped_refptr<net::IOBufferWithSize> buf( new net::IOBufferWithSize(kTestDataSize)); - int rv = reader->Read(buf, buf->size(), base::Bind(&NeverCalled)); + int rv = reader->Read(buf.get(), buf->size(), base::Bind(&NeverCalled)); ASSERT_TRUE(rv == net::ERR_IO_PENDING || rv >= 0); // Delete immediately. diff --git a/webkit/browser/blob/mock_blob_url_request_context.cc b/webkit/browser/blob/mock_blob_url_request_context.cc index aaffad7..98f12de 100644 --- a/webkit/browser/blob/mock_blob_url_request_context.cc +++ b/webkit/browser/blob/mock_blob_url_request_context.cc @@ -64,7 +64,7 @@ ScopedTextBlob::ScopedTextBlob( DCHECK(blob_storage_controller_); scoped_refptr<BlobData> blob_data(new BlobData()); blob_data->AppendData(data); - blob_storage_controller_->AddFinishedBlob(blob_url_, blob_data); + blob_storage_controller_->AddFinishedBlob(blob_url_, blob_data.get()); } ScopedTextBlob::~ScopedTextBlob() { diff --git a/webkit/browser/blob/view_blob_internals_job.cc b/webkit/browser/blob/view_blob_internals_job.cc index 090a447..2cc8348 100644 --- a/webkit/browser/blob/view_blob_internals_job.cc +++ b/webkit/browser/blob/view_blob_internals_job.cc @@ -171,7 +171,7 @@ void ViewBlobInternalsJob::GenerateHTML(std::string* out) const { ++iter) { AddHTMLBoldText(iter->first, out); AddHTMLButton(kRemove, iter->first, out); - GenerateHTMLForBlobData(*iter->second, out); + GenerateHTMLForBlobData(*iter->second.get(), out); } } diff --git a/webkit/browser/database/database_quota_client.cc b/webkit/browser/database/database_quota_client.cc index 5902d1a..66c2c4d 100644 --- a/webkit/browser/database/database_quota_client.cc +++ b/webkit/browser/database/database_quota_client.cc @@ -101,10 +101,9 @@ DatabaseQuotaClient::DatabaseQuotaClient( } DatabaseQuotaClient::~DatabaseQuotaClient() { - if (db_tracker_thread_ && - !db_tracker_thread_->RunsTasksOnCurrentThread() && - db_tracker_) { - DatabaseTracker* tracker = db_tracker_; + if (db_tracker_thread_.get() && + !db_tracker_thread_->RunsTasksOnCurrentThread() && db_tracker_.get()) { + DatabaseTracker* tracker = db_tracker_.get(); tracker->AddRef(); db_tracker_ = NULL; if (!db_tracker_thread_->ReleaseSoon(FROM_HERE, tracker)) @@ -134,11 +133,9 @@ void DatabaseQuotaClient::GetOriginUsage( } base::PostTaskAndReplyWithResult( - db_tracker_thread_, + db_tracker_thread_.get(), FROM_HERE, - base::Bind(&GetOriginUsageOnDBThread, - db_tracker_, - origin_url), + base::Bind(&GetOriginUsageOnDBThread, db_tracker_, origin_url), callback); } @@ -209,7 +206,7 @@ void DatabaseQuotaClient::DeleteOriginData( callback); PostTaskAndReplyWithResult( - db_tracker_thread_, + db_tracker_thread_.get(), FROM_HERE, base::Bind(&DatabaseTracker::DeleteDataForOrigin, db_tracker_, diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index 0866feb..2567539 100644 --- a/webkit/browser/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -120,7 +120,7 @@ void DatabaseTracker::DatabaseOpened(const base::string16& origin_identifier, return; } - if (quota_manager_proxy_) + if (quota_manager_proxy_.get()) quota_manager_proxy_->NotifyStorageAccessed( quota::QuotaClient::kDatabase, webkit_base::GetOriginURLFromIdentifier(origin_identifier), @@ -155,7 +155,7 @@ void DatabaseTracker::DatabaseClosed(const base::string16& origin_identifier, // We call NotifiyStorageAccessed when a db is opened and also when // closed because we don't call it for read while open. - if (quota_manager_proxy_) + if (quota_manager_proxy_.get()) quota_manager_proxy_->NotifyStorageAccessed( quota::QuotaClient::kDatabase, webkit_base::GetOriginURLFromIdentifier(origin_identifier), @@ -353,8 +353,9 @@ bool DatabaseTracker::DeleteClosedDatabase( if (database_connections_.IsDatabaseOpened(origin_identifier, database_name)) return false; - int64 db_file_size = quota_manager_proxy_ ? - GetDBFileSize(origin_identifier, database_name) : 0; + int64 db_file_size = quota_manager_proxy_.get() + ? GetDBFileSize(origin_identifier, database_name) + : 0; // Try to delete the file on the hard drive. base::FilePath db_file = GetFullDBFilePath(origin_identifier, database_name); @@ -366,7 +367,7 @@ bool DatabaseTracker::DeleteClosedDatabase( file_util::Delete(db_file.InsertBeforeExtensionASCII( DatabaseUtil::kJournalFileSuffix), false); - if (quota_manager_proxy_ && db_file_size) + if (quota_manager_proxy_.get() && db_file_size) quota_manager_proxy_->NotifyStorageModified( quota::QuotaClient::kDatabase, webkit_base::GetOriginURLFromIdentifier(origin_identifier), @@ -396,7 +397,7 @@ bool DatabaseTracker::DeleteOrigin(const base::string16& origin_identifier, return false; int64 deleted_size = 0; - if (quota_manager_proxy_) { + if (quota_manager_proxy_.get()) { CachedOriginInfo* origin_info = GetCachedOriginInfo(origin_identifier); if (origin_info) deleted_size = origin_info->TotalSize(); @@ -427,7 +428,7 @@ bool DatabaseTracker::DeleteOrigin(const base::string16& origin_identifier, databases_table_->DeleteOrigin(origin_identifier); - if (quota_manager_proxy_ && deleted_size) { + if (quota_manager_proxy_.get() && deleted_size) { quota_manager_proxy_->NotifyStorageModified( quota::QuotaClient::kDatabase, webkit_base::GetOriginURLFromIdentifier(origin_identifier), @@ -614,7 +615,7 @@ int64 DatabaseTracker::UpdateOpenDatabaseInfoAndNotify( database_connections_.SetOpenDatabaseSize(origin_id, name, new_size); if (info) info->SetDatabaseSize(name, new_size); - if (quota_manager_proxy_) + if (quota_manager_proxy_.get()) quota_manager_proxy_->NotifyStorageModified( quota::QuotaClient::kDatabase, webkit_base::GetOriginURLFromIdentifier(origin_id), diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index f2b3a90..056aa88 100644 --- a/webkit/browser/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -196,8 +196,11 @@ class DatabaseTracker_TestHelper_Test { new quota::MockSpecialStoragePolicy; special_storage_policy->AddProtected(GURL(kOrigin2Url)); scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), incognito_mode, - special_storage_policy, NULL, NULL)); + new DatabaseTracker(temp_dir.path(), + incognito_mode, + special_storage_policy.get(), + NULL, + NULL)); // Create and open three databases. int64 database_size = 0; @@ -301,8 +304,11 @@ class DatabaseTracker_TestHelper_Test { new quota::MockSpecialStoragePolicy; special_storage_policy->AddProtected(GURL(kOrigin2Url)); scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), incognito_mode, - special_storage_policy, NULL, NULL)); + new DatabaseTracker(temp_dir.path(), + incognito_mode, + special_storage_policy.get(), + NULL, + NULL)); // Add two observers. TestObserver observer1; @@ -452,8 +458,11 @@ class DatabaseTracker_TestHelper_Test { scoped_refptr<TestQuotaManagerProxy> test_quota_proxy( new TestQuotaManagerProxy); scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), false /* incognito */, - NULL, test_quota_proxy, NULL)); + new DatabaseTracker(temp_dir.path(), + false /* incognito */, + NULL, + test_quota_proxy.get(), + NULL)); EXPECT_TRUE(test_quota_proxy->registered_client_); // Create a database and modify it a couple of times, close it, @@ -554,9 +563,11 @@ class DatabaseTracker_TestHelper_Test { new quota::MockSpecialStoragePolicy; special_storage_policy->AddSessionOnly(GURL(kOrigin2Url)); scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker( - temp_dir.path(), false, special_storage_policy, NULL, - base::MessageLoopProxy::current())); + new DatabaseTracker(temp_dir.path(), + false, + special_storage_policy.get(), + NULL, + base::MessageLoopProxy::current())); // Open two new databases. tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, @@ -632,9 +643,11 @@ class DatabaseTracker_TestHelper_Test { new quota::MockSpecialStoragePolicy; special_storage_policy->AddSessionOnly(GURL(kOrigin2Url)); scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker( - temp_dir.path(), false, special_storage_policy, NULL, - base::MessageLoopProxy::current())); + new DatabaseTracker(temp_dir.path(), + false, + special_storage_policy.get(), + NULL, + base::MessageLoopProxy::current())); tracker->SetForceKeepSessionState(); // Open two new databases. diff --git a/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc index 92b9d04..b971fd5 100644 --- a/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc +++ b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc @@ -98,8 +98,8 @@ class CopyOrMoveFileValidatorTestHelper { ASSERT_FALSE(FileExists(copy_dest_, 10)); EXPECT_EQ(expected, - AsyncFileTestHelper::Copy(file_system_context_, copy_src_, - copy_dest_)); + AsyncFileTestHelper::Copy( + file_system_context_.get(), copy_src_, copy_dest_)); EXPECT_TRUE(FileExists(copy_src_, 10)); if (expected == base::PLATFORM_FILE_OK) @@ -113,8 +113,8 @@ class CopyOrMoveFileValidatorTestHelper { ASSERT_FALSE(FileExists(move_dest_, 10)); EXPECT_EQ(expected, - AsyncFileTestHelper::Move(file_system_context_, move_src_, - move_dest_)); + AsyncFileTestHelper::Move( + file_system_context_.get(), move_src_, move_dest_)); if (expected == base::PLATFORM_FILE_OK) { EXPECT_FALSE(FileExists(move_src_, 10)); @@ -140,19 +140,21 @@ class CopyOrMoveFileValidatorTestHelper { base::PlatformFileError CreateFile(const FileSystemURL& url, size_t size) { base::PlatformFileError result = - AsyncFileTestHelper::CreateFile(file_system_context_, url); + AsyncFileTestHelper::CreateFile(file_system_context_.get(), url); if (result != base::PLATFORM_FILE_OK) return result; - return AsyncFileTestHelper::TruncateFile(file_system_context_, url, size); + return AsyncFileTestHelper::TruncateFile( + file_system_context_.get(), url, size); } base::PlatformFileError CreateDirectory(const FileSystemURL& url) { - return AsyncFileTestHelper::CreateDirectory(file_system_context_, url); + return AsyncFileTestHelper::CreateDirectory(file_system_context_.get(), + url); } bool FileExists(const FileSystemURL& url, int64 expected_size) { return AsyncFileTestHelper::FileExists( - file_system_context_, url, expected_size); + file_system_context_.get(), url, expected_size); } base::ScopedTempDir base_; diff --git a/webkit/browser/fileapi/file_system_context_unittest.cc b/webkit/browser/fileapi/file_system_context_unittest.cc index c699fd2..d6ac71a 100644 --- a/webkit/browser/fileapi/file_system_context_unittest.cc +++ b/webkit/browser/fileapi/file_system_context_unittest.cc @@ -49,25 +49,24 @@ class FileSystemContextTest : public testing::Test { storage_policy_ = new quota::MockSpecialStoragePolicy(); - mock_quota_manager_ = new quota::MockQuotaManager( - false /* is_incognito */, - data_dir_.path(), - base::MessageLoopProxy::current(), - base::MessageLoopProxy::current(), - storage_policy_); + mock_quota_manager_ = + new quota::MockQuotaManager(false /* is_incognito */, + data_dir_.path(), + base::MessageLoopProxy::current(), + base::MessageLoopProxy::current(), + storage_policy_.get()); } protected: FileSystemContext* CreateFileSystemContextForTest( ExternalMountPoints* external_mount_points) { - return new FileSystemContext( - FileSystemTaskRunners::CreateMockTaskRunners(), - external_mount_points, - storage_policy_, - mock_quota_manager_->proxy(), - ScopedVector<FileSystemMountPointProvider>(), - data_dir_.path(), - CreateAllowFileAccessOptions()); + return new FileSystemContext(FileSystemTaskRunners::CreateMockTaskRunners(), + external_mount_points, + storage_policy_.get(), + mock_quota_manager_->proxy(), + ScopedVector<FileSystemMountPointProvider>(), + data_dir_.path(), + CreateAllowFileAccessOptions()); } // Verifies a *valid* filesystem url has expected values. @@ -186,7 +185,7 @@ TEST_F(FileSystemContextTest, CrackFileSystemURL) { scoped_refptr<ExternalMountPoints> external_mount_points( ExternalMountPoints::CreateRefCounted()); scoped_refptr<FileSystemContext> file_system_context( - CreateFileSystemContextForTest(external_mount_points)); + CreateFileSystemContextForTest(external_mount_points.get())); // Register an isolated mount point. std::string isolated_file_system_name = "root"; diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc index f8cc7de..153752e 100644 --- a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -106,8 +106,8 @@ class FileSystemDirURLRequestJobTest : public testing::Test { } FileSystemOperationContext* NewOperationContext() { - FileSystemOperationContext* context(new FileSystemOperationContext( - file_system_context_)); + FileSystemOperationContext* context( + new FileSystemOperationContext(file_system_context_.get())); context->set_allowed_bytes_growth(1024); return context; } diff --git a/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc b/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc index 68a7132..31f91ae 100644 --- a/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc +++ b/webkit/browser/fileapi/file_system_file_stream_reader_unittest.cc @@ -43,7 +43,7 @@ void ReadFromReader(FileSystemFileStreamReader* reader, while (total_bytes_read < size) { scoped_refptr<net::IOBufferWithSize> buf( new net::IOBufferWithSize(size - total_bytes_read)); - int rv = reader->Read(buf, buf->size(), callback.callback()); + int rv = reader->Read(buf.get(), buf->size(), callback.callback()); if (rv == net::ERR_IO_PENDING) rv = callback.WaitForResult(); if (rv < 0) @@ -89,7 +89,7 @@ class FileSystemFileStreamReaderTest : public testing::Test { const std::string& file_name, int64 initial_offset, const base::Time& expected_modification_time) { - return new FileSystemFileStreamReader(file_system_context_, + return new FileSystemFileStreamReader(file_system_context_.get(), GetFileSystemURL(file_name), initial_offset, expected_modification_time); @@ -107,7 +107,7 @@ class FileSystemFileStreamReaderTest : public testing::Test { sandbox_provider()->GetFileUtil(kFileSystemTypeTemporary); FileSystemURL url = GetFileSystemURL(file_name); - FileSystemOperationContext context(file_system_context_); + FileSystemOperationContext context(file_system_context_.get()); context.set_allowed_bytes_growth(1024); base::PlatformFile handle = base::kInvalidPlatformFileValue; @@ -271,7 +271,7 @@ TEST_F(FileSystemFileStreamReaderTest, DeleteWithUnfinishedRead) { net::TestCompletionCallback callback; scoped_refptr<net::IOBufferWithSize> buf( new net::IOBufferWithSize(kTestDataSize)); - int rv = reader->Read(buf, buf->size(), base::Bind(&NeverCalled)); + int rv = reader->Read(buf.get(), buf->size(), base::Bind(&NeverCalled)); ASSERT_TRUE(rv == net::ERR_IO_PENDING || rv >= 0); // Delete immediately. diff --git a/webkit/browser/fileapi/file_system_quota_client_unittest.cc b/webkit/browser/fileapi/file_system_quota_client_unittest.cc index ade671a..5e69a1a 100644 --- a/webkit/browser/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/browser/fileapi/file_system_quota_client_unittest.cc @@ -59,8 +59,7 @@ class FileSystemQuotaClientTest : public testing::Test { protected: FileSystemQuotaClient* NewQuotaClient(bool is_incognito) { - return new FileSystemQuotaClient( - file_system_context_, is_incognito); + return new FileSystemQuotaClient(file_system_context_.get(), is_incognito); } void GetOriginUsageAsync(FileSystemQuotaClient* quota_client, @@ -115,7 +114,7 @@ class FileSystemQuotaClientTest : public testing::Test { FileSystemOperationContext* CreateFileSystemOperationContext( FileSystemType type) { FileSystemOperationContext* context = - new FileSystemOperationContext(file_system_context_); + new FileSystemOperationContext(file_system_context_.get()); context->set_allowed_bytes_growth(100000000); context->set_update_observers( *file_system_context_->GetUpdateObservers(type)); diff --git a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc index ce59f3c..0b1db55 100644 --- a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc @@ -76,7 +76,7 @@ class FileSystemURLRequestJobTest : public testing::Test { virtual void TearDown() OVERRIDE { net::URLRequest::Deprecated::RegisterProtocolFactory("filesystem", NULL); ClearUnusedJob(); - if (pending_job_) { + if (pending_job_.get()) { pending_job_->Kill(); pending_job_ = NULL; } @@ -130,7 +130,7 @@ class FileSystemURLRequestJobTest : public testing::Test { kFileSystemTypeTemporary, base::FilePath().AppendASCII(dir_name)); - FileSystemOperationContext context(file_system_context_); + FileSystemOperationContext context(file_system_context_.get()); context.set_allowed_bytes_growth(1024); ASSERT_EQ(base::PLATFORM_FILE_OK, file_util->CreateDirectory( @@ -149,7 +149,7 @@ class FileSystemURLRequestJobTest : public testing::Test { kFileSystemTypeTemporary, base::FilePath().AppendASCII(file_name)); - FileSystemOperationContext context(file_system_context_); + FileSystemOperationContext context(file_system_context_.get()); context.set_allowed_bytes_growth(1024); base::PlatformFile handle = base::kInvalidPlatformFileValue; diff --git a/webkit/browser/fileapi/file_system_usage_cache.cc b/webkit/browser/fileapi/file_system_usage_cache.cc index d6eb8f3..59dfbbd 100644 --- a/webkit/browser/fileapi/file_system_usage_cache.cc +++ b/webkit/browser/fileapi/file_system_usage_cache.cc @@ -299,7 +299,7 @@ void FileSystemUsageCache::ScheduleCloseTimer() { } bool FileSystemUsageCache::CalledOnValidThread() { - return !task_runner_ || task_runner_->RunsTasksOnCurrentThread(); + return !task_runner_.get() || task_runner_->RunsTasksOnCurrentThread(); } bool FileSystemUsageCache::HasCacheFileHandle(const base::FilePath& file_path) { diff --git a/webkit/browser/fileapi/file_writer_delegate.cc b/webkit/browser/fileapi/file_writer_delegate.cc index f3a2d94..3c7b781 100644 --- a/webkit/browser/fileapi/file_writer_delegate.cc +++ b/webkit/browser/fileapi/file_writer_delegate.cc @@ -143,7 +143,7 @@ void FileWriterDelegate::OnDataReceived(int bytes_read) { // This could easily be optimized to rotate between a pool of buffers, so // that we could read and write at the same time. It's not yet clear that // it's necessary. - cursor_ = new net::DrainableIOBuffer(io_buffer_, bytes_read_); + cursor_ = new net::DrainableIOBuffer(io_buffer_.get(), bytes_read_); Write(); } } @@ -152,7 +152,7 @@ void FileWriterDelegate::Write() { writing_started_ = true; int64 bytes_to_write = bytes_read_ - bytes_written_; int write_response = - file_stream_writer_->Write(cursor_, + file_stream_writer_->Write(cursor_.get(), static_cast<int>(bytes_to_write), base::Bind(&FileWriterDelegate::OnDataWritten, weak_factory_.GetWeakPtr())); diff --git a/webkit/browser/fileapi/file_writer_delegate_unittest.cc b/webkit/browser/fileapi/file_writer_delegate_unittest.cc index c094ea1..36eb72b 100644 --- a/webkit/browser/fileapi/file_writer_delegate_unittest.cc +++ b/webkit/browser/fileapi/file_writer_delegate_unittest.cc @@ -86,10 +86,9 @@ class FileWriterDelegateTest : public PlatformTest { } int64 usage() { - return file_system_context_->GetQuotaUtil(kFileSystemType)-> - GetOriginUsageOnFileThread(file_system_context_, - kOrigin, - kFileSystemType); + return file_system_context_->GetQuotaUtil(kFileSystemType) + ->GetOriginUsageOnFileThread( + file_system_context_.get(), kOrigin, kFileSystemType); } int64 GetFileSizeOnDisk(const char* test_file_path) { @@ -114,7 +113,7 @@ class FileWriterDelegateTest : public PlatformTest { scoped_ptr<FileSystemOperationContext> NewOperationContext() { FileSystemOperationContext* context = - new FileSystemOperationContext(file_system_context_); + new FileSystemOperationContext(file_system_context_.get()); context->set_update_observers( *file_system_context_->GetUpdateObservers(kFileSystemType)); context->set_root_path(dir_.path()); @@ -127,7 +126,7 @@ class FileWriterDelegateTest : public PlatformTest { int64 allowed_growth, Result* result) { SandboxFileStreamWriter* writer = new SandboxFileStreamWriter( - file_system_context_, + file_system_context_.get(), GetFileSystemURL(test_file_path), offset, *file_system_context_->GetUpdateObservers(kFileSystemType)); diff --git a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc index 984a114..a4a7c8e 100644 --- a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc +++ b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc @@ -37,12 +37,12 @@ class LocalFileStreamWriterTest : public testing::Test { const std::string& data) { scoped_refptr<net::StringIOBuffer> buffer(new net::StringIOBuffer(data)); scoped_refptr<net::DrainableIOBuffer> drainable( - new net::DrainableIOBuffer(buffer, buffer->size())); + new net::DrainableIOBuffer(buffer.get(), buffer->size())); while (drainable->BytesRemaining() > 0) { net::TestCompletionCallback callback; - int result = writer->Write(drainable, drainable->BytesRemaining(), - callback.callback()); + int result = writer->Write( + drainable.get(), drainable->BytesRemaining(), callback.callback()); if (result == net::ERR_IO_PENDING) result = callback.WaitForResult(); if (result <= 0) @@ -146,7 +146,8 @@ TEST_F(LocalFileStreamWriterTest, CancelWrite) { scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 0)); scoped_refptr<net::StringIOBuffer> buffer(new net::StringIOBuffer("xxx")); - int result = writer->Write(buffer, buffer->size(), base::Bind(&NeverCalled)); + int result = + writer->Write(buffer.get(), buffer->size(), base::Bind(&NeverCalled)); ASSERT_EQ(net::ERR_IO_PENDING, result); net::TestCompletionCallback callback; diff --git a/webkit/browser/fileapi/local_file_system_cross_operation_unittest.cc b/webkit/browser/fileapi/local_file_system_cross_operation_unittest.cc index 1f1ad04..cb0dfbf 100644 --- a/webkit/browser/fileapi/local_file_system_cross_operation_unittest.cc +++ b/webkit/browser/fileapi/local_file_system_cross_operation_unittest.cc @@ -62,11 +62,9 @@ class CrossOperationTestHelper { base::MessageLoopProxy::current(), NULL /* special storage policy */); quota_manager_proxy_ = new quota::MockQuotaManagerProxy( - quota_manager_, - base::MessageLoopProxy::current()); - file_system_context_ = CreateFileSystemContextForTesting( - quota_manager_proxy_, - base_dir); + quota_manager_.get(), base::MessageLoopProxy::current()); + file_system_context_ = + CreateFileSystemContextForTesting(quota_manager_proxy_.get(), base_dir); // Prepare the origin's root directory. FileSystemMountPointProvider* mount_point_provider = @@ -116,12 +114,12 @@ class CrossOperationTestHelper { base::PlatformFileError Copy(const FileSystemURL& src, const FileSystemURL& dest) { - return AsyncFileTestHelper::Copy(file_system_context_, src, dest); + return AsyncFileTestHelper::Copy(file_system_context_.get(), src, dest); } base::PlatformFileError Move(const FileSystemURL& src, const FileSystemURL& dest) { - return AsyncFileTestHelper::Move(file_system_context_, src, dest); + return AsyncFileTestHelper::Move(file_system_context_.get(), src, dest); } base::PlatformFileError SetUpTestCaseFiles( @@ -188,36 +186,37 @@ class CrossOperationTestHelper { base::PlatformFileError ReadDirectory(const FileSystemURL& url, FileEntryList* entries) { return AsyncFileTestHelper::ReadDirectory( - file_system_context_, url, entries); + file_system_context_.get(), url, entries); } base::PlatformFileError CreateDirectory(const FileSystemURL& url) { - return AsyncFileTestHelper::CreateDirectory( - file_system_context_, url); + return AsyncFileTestHelper::CreateDirectory(file_system_context_.get(), + url); } base::PlatformFileError CreateFile(const FileSystemURL& url, size_t size) { base::PlatformFileError result = - AsyncFileTestHelper::CreateFile(file_system_context_, url); + AsyncFileTestHelper::CreateFile(file_system_context_.get(), url); if (result != base::PLATFORM_FILE_OK) return result; - return AsyncFileTestHelper::TruncateFile(file_system_context_, url, size); + return AsyncFileTestHelper::TruncateFile( + file_system_context_.get(), url, size); } bool FileExists(const FileSystemURL& url, int64 expected_size) { return AsyncFileTestHelper::FileExists( - file_system_context_, url, expected_size); + file_system_context_.get(), url, expected_size); } bool DirectoryExists(const FileSystemURL& url) { - return AsyncFileTestHelper::DirectoryExists(file_system_context_, url); + return AsyncFileTestHelper::DirectoryExists(file_system_context_.get(), + url); } private: void GetUsageAndQuota(FileSystemType type, int64* usage, int64* quota) { - quota::QuotaStatusCode status = - AsyncFileTestHelper::GetUsageAndQuota( - quota_manager_, origin_, type, usage, quota); + quota::QuotaStatusCode status = AsyncFileTestHelper::GetUsageAndQuota( + quota_manager_.get(), origin_, type, usage, quota); ASSERT_EQ(quota::kQuotaStatusOk, status); } diff --git a/webkit/browser/fileapi/local_file_system_operation.h b/webkit/browser/fileapi/local_file_system_operation.h index 9321c44..aaf8c1f 100644 --- a/webkit/browser/fileapi/local_file_system_operation.h +++ b/webkit/browser/fileapi/local_file_system_operation.h @@ -166,7 +166,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSystemOperation base::FilePath* platform_path); FileSystemContext* file_system_context() const { - return file_system_context_; + return file_system_context_.get(); } FileSystemOperationContext* operation_context() const { diff --git a/webkit/browser/fileapi/local_file_system_operation_unittest.cc b/webkit/browser/fileapi/local_file_system_operation_unittest.cc index 19a2467..4a5d585 100644 --- a/webkit/browser/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/browser/fileapi/local_file_system_operation_unittest.cc @@ -90,7 +90,7 @@ class LocalFileSystemOperationTest } const ShareableFileReference* shareable_file_ref() const { - return shareable_file_ref_; + return shareable_file_ref_.get(); } quota::MockQuotaManager* quota_manager() { @@ -225,11 +225,11 @@ class LocalFileSystemOperationTest void GetUsageAndQuota(int64* usage, int64* quota) { quota::QuotaStatusCode status = - AsyncFileTestHelper::GetUsageAndQuota( - quota_manager_, - sandbox_file_system_.origin(), - sandbox_file_system_.type(), - usage, quota); + AsyncFileTestHelper::GetUsageAndQuota(quota_manager_.get(), + sandbox_file_system_.origin(), + sandbox_file_system_.type(), + usage, + quota); base::MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(quota::kQuotaStatusOk, status); } diff --git a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc index 28849ac..8c908e5 100644 --- a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc +++ b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc @@ -73,7 +73,7 @@ class LocalFileSystemOperationWriteTest file_system_context_ = CreateFileSystemContextForTesting( quota_manager_->proxy(), dir_.path()); url_request_context_.reset( - new MockBlobURLRequestContext(file_system_context_)); + new MockBlobURLRequestContext(file_system_context_.get())); NewOperation()->CreateFile( URLForPath(virtual_path_), true /* exclusive */, @@ -194,8 +194,8 @@ TEST_F(LocalFileSystemOperationWriteTest, TestWriteZero) { GURL blob_url("blob:zero"); scoped_refptr<webkit_blob::BlobData> blob_data(new webkit_blob::BlobData()); - url_request_context().blob_storage_controller()->AddFinishedBlob( - blob_url, blob_data); + url_request_context().blob_storage_controller() + ->AddFinishedBlob(blob_url, blob_data.get()); NewOperation()->Write( &url_request_context(), URLForPath(virtual_path_), diff --git a/webkit/browser/fileapi/local_file_util_unittest.cc b/webkit/browser/fileapi/local_file_util_unittest.cc index cac0d4c..9abcffc 100644 --- a/webkit/browser/fileapi/local_file_util_unittest.cc +++ b/webkit/browser/fileapi/local_file_util_unittest.cc @@ -49,7 +49,7 @@ class LocalFileUtilTest : public testing::Test { protected: FileSystemOperationContext* NewContext() { FileSystemOperationContext* context = - new FileSystemOperationContext(file_system_context_); + new FileSystemOperationContext(file_system_context_.get()); context->set_update_observers( *file_system_context_->GetUpdateObservers(kFileSystemType)); context->set_root_path(data_dir_.path()); @@ -110,7 +110,7 @@ class LocalFileUtilTest : public testing::Test { } FileSystemContext* file_system_context() { - return file_system_context_; + return file_system_context_.get(); } private: diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc index 3a76111..f976985 100644 --- a/webkit/browser/fileapi/obfuscated_file_util.cc +++ b/webkit/browser/fileapi/obfuscated_file_util.cc @@ -1167,7 +1167,7 @@ SandboxDirectoryDatabase* ObfuscatedFileUtil::GetDirectoryDatabase( base::FilePath ObfuscatedFileUtil::GetDirectoryForOrigin( const GURL& origin, bool create, base::PlatformFileError* error_code) { - if (special_storage_policy_ && + if (special_storage_policy_.get() && special_storage_policy_->HasIsolatedStorage(origin)) { CHECK(isolated_origin_.is_empty() || isolated_origin_ == origin) << "multiple origins for an isolated site: " diff --git a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc index 0450772..f1fa1b1 100644 --- a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc @@ -132,12 +132,11 @@ class ObfuscatedFileUtilTest : public testing::Test { scoped_refptr<quota::SpecialStoragePolicy> storage_policy = new quota::MockSpecialStoragePolicy(); - quota_manager_ = new quota::QuotaManager( - false /* is_incognito */, - data_dir_.path(), - base::MessageLoopProxy::current(), - base::MessageLoopProxy::current(), - storage_policy); + quota_manager_ = new quota::QuotaManager(false /* is_incognito */, + data_dir_.path(), + base::MessageLoopProxy::current(), + base::MessageLoopProxy::current(), + storage_policy.get()); // Every time we create a new sandbox_file_system helper, // it creates another context, which creates another path manager, @@ -227,9 +226,12 @@ class ObfuscatedFileUtilTest : public testing::Test { void GetUsageFromQuotaManager() { int64 quota = -1; - quota_status_ = AsyncFileTestHelper::GetUsageAndQuota( - quota_manager_, origin(), sandbox_file_system_.type(), - &usage_, "a); + quota_status_ = + AsyncFileTestHelper::GetUsageAndQuota(quota_manager_.get(), + origin(), + sandbox_file_system_.type(), + &usage_, + "a); EXPECT_EQ(quota::kQuotaStatusOk, quota_status_); } diff --git a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc index 5abcd45..d55b013 100644 --- a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc +++ b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc @@ -91,8 +91,8 @@ FileSystemURL SandboxFileSystemTestHelper::CreateURL( } int64 SandboxFileSystemTestHelper::GetCachedOriginUsage() const { - return file_system_context_->GetQuotaUtil(type_)->GetOriginUsageOnFileThread( - file_system_context_, origin_, type_); + return file_system_context_->GetQuotaUtil(type_) + ->GetOriginUsageOnFileThread(file_system_context_.get(), origin_, type_); } int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() { @@ -133,7 +133,7 @@ FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() { } void SandboxFileSystemTestHelper::SetUpFileSystem() { - DCHECK(file_system_context_); + DCHECK(file_system_context_.get()); DCHECK(file_system_context_->sandbox_provider()->CanHandleType(type_)); file_util_ = file_system_context_->GetFileUtil(type_); diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.cc b/webkit/browser/fileapi/sandbox_mount_point_provider.cc index 49cbfe8..b9789fb 100644 --- a/webkit/browser/fileapi/sandbox_mount_point_provider.cc +++ b/webkit/browser/fileapi/sandbox_mount_point_provider.cc @@ -171,7 +171,8 @@ SandboxMountPointProvider::SandboxMountPointProvider( AccessObserverList::Source access_observers_src; if (enable_usage_tracking_) { - update_observers_src.AddObserver(quota_observer_.get(), file_task_runner_); + update_observers_src.AddObserver(quota_observer_.get(), + file_task_runner_.get()); access_observers_src.AddObserver(quota_observer_.get(), NULL); } @@ -317,7 +318,7 @@ FileSystemOperation* SandboxMountPointProvider::CreateFileSystemOperation( operation_context->set_update_observers(update_observers_); operation_context->set_access_observers(access_observers_); - if (special_storage_policy_ && + if (special_storage_policy_.get() && special_storage_policy_->IsStorageUnlimited(url.origin())) { operation_context->set_quota_limit_type(quota::kQuotaLimitTypeUnlimited); } else { diff --git a/webkit/browser/fileapi/sandbox_quota_observer.cc b/webkit/browser/fileapi/sandbox_quota_observer.cc index 05fa511..9098db5 100644 --- a/webkit/browser/fileapi/sandbox_quota_observer.cc +++ b/webkit/browser/fileapi/sandbox_quota_observer.cc @@ -42,7 +42,7 @@ void SandboxQuotaObserver::OnUpdate(const FileSystemURL& url, DCHECK(SandboxMountPointProvider::IsSandboxType(url.type())); DCHECK(update_notify_runner_->RunsTasksOnCurrentThread()); - if (quota_manager_proxy_) { + if (quota_manager_proxy_.get()) { quota_manager_proxy_->NotifyStorageModified( quota::QuotaClient::kFileSystem, url.origin(), @@ -83,7 +83,7 @@ void SandboxQuotaObserver::OnEndUpdate(const FileSystemURL& url) { void SandboxQuotaObserver::OnAccess(const FileSystemURL& url) { DCHECK(SandboxMountPointProvider::IsSandboxType(url.type())); - if (quota_manager_proxy_) { + if (quota_manager_proxy_.get()) { quota_manager_proxy_->NotifyStorageAccessed( quota::QuotaClient::kFileSystem, url.origin(), @@ -95,10 +95,11 @@ void SandboxQuotaObserver::SetUsageCacheEnabled( const GURL& origin, FileSystemType type, bool enabled) { - if (quota_manager_proxy_) { + if (quota_manager_proxy_.get()) { quota_manager_proxy_->SetUsageCacheEnabled( quota::QuotaClient::kFileSystem, - origin, FileSystemTypeToQuotaStorageType(type), + origin, + FileSystemTypeToQuotaStorageType(type), enabled); } } diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc index 33b4e3e..2913d69 100644 --- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc +++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc @@ -201,20 +201,19 @@ void CannedSyncableFileSystem::SetUp() { scoped_refptr<quota::SpecialStoragePolicy> storage_policy = new quota::MockSpecialStoragePolicy(); - quota_manager_ = new QuotaManager( - false /* is_incognito */, - data_dir_.path(), - io_task_runner_, - base::MessageLoopProxy::current(), - storage_policy); + quota_manager_ = new QuotaManager(false /* is_incognito */, + data_dir_.path(), + io_task_runner_.get(), + base::MessageLoopProxy::current(), + storage_policy.get()); file_system_context_ = new FileSystemContext( - make_scoped_ptr(new fileapi::FileSystemTaskRunners( - io_task_runner_, - file_task_runner_, - file_task_runner_)), + make_scoped_ptr( + new fileapi::FileSystemTaskRunners(io_task_runner_.get(), + file_task_runner_.get(), + file_task_runner_.get())), fileapi::ExternalMountPoints::CreateRefCounted().get(), - storage_policy, + storage_policy.get(), quota_manager_->proxy(), ScopedVector<fileapi::FileSystemMountPointProvider>(), data_dir_.path(), @@ -233,8 +232,8 @@ void CannedSyncableFileSystem::TearDown() { SetEnableSyncFSDirectoryOperation(false); // Make sure we give some more time to finish tasks on other threads. - EnsureLastTaskRuns(io_task_runner_); - EnsureLastTaskRuns(file_task_runner_); + EnsureLastTaskRuns(io_task_runner_.get()); + EnsureLastTaskRuns(file_task_runner_.get()); } FileSystemURL CannedSyncableFileSystem::URL(const std::string& path) const { @@ -256,11 +255,11 @@ PlatformFileError CannedSyncableFileSystem::OpenFileSystem() { base::MessageLoop::current()->Run(); if (file_system_context_->sync_context()) { // Register 'this' as a sync status observer. - RunOnThread(io_task_runner_, - FROM_HERE, - base::Bind( - &CannedSyncableFileSystem::InitializeSyncStatusObserver, - base::Unretained(this))); + RunOnThread( + io_task_runner_.get(), + FROM_HERE, + base::Bind(&CannedSyncableFileSystem::InitializeSyncStatusObserver, + base::Unretained(this))); } return result_; } @@ -279,9 +278,12 @@ SyncStatusCode CannedSyncableFileSystem::MaybeInitializeFileSystemContext( LocalFileSyncContext* sync_context) { DCHECK(sync_context); sync_status_ = sync_file_system::SYNC_STATUS_UNKNOWN; - VerifySameTaskRunner(io_task_runner_, sync_context->io_task_runner_); + VerifySameTaskRunner(io_task_runner_.get(), + sync_context->io_task_runner_.get()); sync_context->MaybeInitializeFileSystemContext( - origin_, service_name_, file_system_context_, + origin_, + service_name_, + file_system_context_.get(), base::Bind(&CannedSyncableFileSystem::DidInitializeFileSystemContext, base::Unretained(this))); base::MessageLoop::current()->Run(); @@ -291,46 +293,54 @@ SyncStatusCode CannedSyncableFileSystem::MaybeInitializeFileSystemContext( PlatformFileError CannedSyncableFileSystem::CreateDirectory( const FileSystemURL& url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoCreateDirectory, - base::Unretained(this), url)); + base::Unretained(this), + url)); } PlatformFileError CannedSyncableFileSystem::CreateFile( const FileSystemURL& url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoCreateFile, - base::Unretained(this), url)); + base::Unretained(this), + url)); } PlatformFileError CannedSyncableFileSystem::Copy( const FileSystemURL& src_url, const FileSystemURL& dest_url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoCopy, - base::Unretained(this), src_url, dest_url)); + base::Unretained(this), + src_url, + dest_url)); } PlatformFileError CannedSyncableFileSystem::Move( const FileSystemURL& src_url, const FileSystemURL& dest_url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoMove, - base::Unretained(this), src_url, dest_url)); + base::Unretained(this), + src_url, + dest_url)); } PlatformFileError CannedSyncableFileSystem::TruncateFile( const FileSystemURL& url, int64 size) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoTruncateFile, - base::Unretained(this), url, size)); + base::Unretained(this), + url, + size)); } PlatformFileError CannedSyncableFileSystem::TouchFile( @@ -338,48 +348,56 @@ PlatformFileError CannedSyncableFileSystem::TouchFile( const base::Time& last_access_time, const base::Time& last_modified_time) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoTouchFile, - base::Unretained(this), url, - last_access_time, last_modified_time)); + base::Unretained(this), + url, + last_access_time, + last_modified_time)); } PlatformFileError CannedSyncableFileSystem::Remove( const FileSystemURL& url, bool recursive) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoRemove, - base::Unretained(this), url, recursive)); + base::Unretained(this), + url, + recursive)); } PlatformFileError CannedSyncableFileSystem::FileExists( const FileSystemURL& url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoFileExists, - base::Unretained(this), url)); + base::Unretained(this), + url)); } PlatformFileError CannedSyncableFileSystem::DirectoryExists( const FileSystemURL& url) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoDirectoryExists, - base::Unretained(this), url)); + base::Unretained(this), + url)); } PlatformFileError CannedSyncableFileSystem::VerifyFile( const FileSystemURL& url, const std::string& expected_data) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoVerifyFile, - base::Unretained(this), url, expected_data)); + base::Unretained(this), + url, + expected_data)); } PlatformFileError CannedSyncableFileSystem::GetMetadata( @@ -387,53 +405,63 @@ PlatformFileError CannedSyncableFileSystem::GetMetadata( base::PlatformFileInfo* info, base::FilePath* platform_path) { return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoGetMetadata, - base::Unretained(this), url, info, platform_path)); + base::Unretained(this), + url, + info, + platform_path)); } int64 CannedSyncableFileSystem::Write( net::URLRequestContext* url_request_context, const FileSystemURL& url, const GURL& blob_url) { - return RunOnThread<int64>( - io_task_runner_, - FROM_HERE, - base::Bind(&CannedSyncableFileSystem::DoWrite, - base::Unretained(this), url_request_context, url, blob_url)); + return RunOnThread<int64>(io_task_runner_.get(), + FROM_HERE, + base::Bind(&CannedSyncableFileSystem::DoWrite, + base::Unretained(this), + url_request_context, + url, + blob_url)); } int64 CannedSyncableFileSystem::WriteString( const FileSystemURL& url, const std::string& data) { - return RunOnThread<int64>( - io_task_runner_, - FROM_HERE, - base::Bind(&CannedSyncableFileSystem::DoWriteString, - base::Unretained(this), url, data)); + return RunOnThread<int64>(io_task_runner_.get(), + FROM_HERE, + base::Bind(&CannedSyncableFileSystem::DoWriteString, + base::Unretained(this), + url, + data)); } PlatformFileError CannedSyncableFileSystem::DeleteFileSystem() { EXPECT_TRUE(is_filesystem_set_up_); return RunOnThread<PlatformFileError>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&FileSystemContext::DeleteFileSystem, - file_system_context_, origin_, type_)); + file_system_context_, + origin_, + type_)); } quota::QuotaStatusCode CannedSyncableFileSystem::GetUsageAndQuota( int64* usage, int64* quota) { return RunOnThread<quota::QuotaStatusCode>( - io_task_runner_, + io_task_runner_.get(), FROM_HERE, base::Bind(&CannedSyncableFileSystem::DoGetUsageAndQuota, - base::Unretained(this), usage, quota)); + base::Unretained(this), + usage, + quota)); } void CannedSyncableFileSystem::GetChangedURLsInTracker( FileSystemURLSet* urls) { return RunOnThread( - file_task_runner_, + file_task_runner_.get(), FROM_HERE, base::Bind(&LocalFileChangeTracker::GetAllChangedURLs, base::Unretained(file_system_context_->change_tracker()), @@ -443,7 +471,7 @@ void CannedSyncableFileSystem::GetChangedURLsInTracker( void CannedSyncableFileSystem::ClearChangeForURLInTracker( const FileSystemURL& url) { return RunOnThread( - file_task_runner_, + file_task_runner_.get(), FROM_HERE, base::Bind(&LocalFileChangeTracker::ClearChangesForURL, base::Unretained(file_system_context_->change_tracker()), @@ -568,7 +596,7 @@ void CannedSyncableFileSystem::DoWriteString( const std::string& data, const WriteCallback& callback) { MockBlobURLRequestContext* url_request_context( - new MockBlobURLRequestContext(file_system_context_)); + new MockBlobURLRequestContext(file_system_context_.get())); const GURL blob_url(std::string("blob:") + data); WriteHelper* helper = new WriteHelper(url_request_context, blob_url, data); NewOperation()->Write(url_request_context, url, blob_url, 0, diff --git a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc index 834389d..a454b8d 100644 --- a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc +++ b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc @@ -45,12 +45,13 @@ class LocalFileChangeTrackerTest : public testing::Test { sync_context_ = new LocalFileSyncContext(base::MessageLoopProxy::current(), base::MessageLoopProxy::current()); - ASSERT_EQ(sync_file_system::SYNC_STATUS_OK, - file_system_.MaybeInitializeFileSystemContext(sync_context_)); + ASSERT_EQ( + sync_file_system::SYNC_STATUS_OK, + file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); } virtual void TearDown() OVERRIDE { - if (sync_context_) + if (sync_context_.get()) sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; diff --git a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc index 539d43e..ad4beb2 100644 --- a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc +++ b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc @@ -207,21 +207,24 @@ class LocalFileSyncContextTest : public testing::Test { }; TEST_F(LocalFileSyncContextTest, ConstructAndDestruct) { - sync_context_ = new LocalFileSyncContext( - ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); sync_context_->ShutdownOnUIThread(); } TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) { - CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); // Initializes file_system using |sync_context_|. EXPECT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); // Make sure everything's set up for file_system to be able to handle // syncable file system operations. @@ -232,7 +235,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) { // Calling MaybeInitialize for the same context multiple times must be ok. EXPECT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); EXPECT_EQ(sync_context_.get(), file_system.file_system_context()->sync_context()); @@ -254,20 +257,25 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) { } TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) { - CannedSyncableFileSystem file_system1(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); - CannedSyncableFileSystem file_system2(GURL(kOrigin2), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system1(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); + CannedSyncableFileSystem file_system2(GURL(kOrigin2), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system1.SetUp(); file_system2.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); // Initializes file_system1 and file_system2. EXPECT_EQ(SYNC_STATUS_OK, - file_system1.MaybeInitializeFileSystemContext(sync_context_)); + file_system1.MaybeInitializeFileSystemContext(sync_context_.get())); EXPECT_EQ(SYNC_STATUS_OK, - file_system2.MaybeInitializeFileSystemContext(sync_context_)); + file_system2.MaybeInitializeFileSystemContext(sync_context_.get())); EXPECT_EQ(base::PLATFORM_FILE_OK, file_system1.OpenFileSystem()); EXPECT_EQ(base::PLATFORM_FILE_OK, file_system2.OpenFileSystem()); @@ -340,12 +348,15 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) { #define MAYBE_PrepareSyncWhileWriting PrepareSyncWhileWriting #endif TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) { - CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); EXPECT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); EXPECT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem()); @@ -397,13 +408,16 @@ TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) { } TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) { - CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); ASSERT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem()); // Record the initial usage (likely 0). @@ -484,13 +498,16 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) { base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); ASSERT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem()); const FileSystemURL kFile1(file_system.URL("file1")); @@ -631,13 +648,16 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate_NoParent) { base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, - io_task_runner_, file_task_runner_); + CannedSyncableFileSystem file_system(GURL(kOrigin1), + kServiceName, + io_task_runner_.get(), + file_task_runner_.get()); file_system.SetUp(); - sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_); + sync_context_ = + new LocalFileSyncContext(ui_task_runner_.get(), io_task_runner_.get()); ASSERT_EQ(SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context_)); + file_system.MaybeInitializeFileSystemContext(sync_context_.get())); ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem()); const char kTestFileData[] = "Lorem ipsum!"; diff --git a/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc index 77cbb1b..03f1a3d 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc +++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc @@ -60,8 +60,9 @@ class SyncableFileOperationRunnerTest : public testing::Test { file_system_.SetUp(); sync_context_ = new LocalFileSyncContext(base::MessageLoopProxy::current(), base::MessageLoopProxy::current()); - ASSERT_EQ(SYNC_STATUS_OK, - file_system_.MaybeInitializeFileSystemContext(sync_context_)); + ASSERT_EQ( + SYNC_STATUS_OK, + file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); ASSERT_EQ(base::PLATFORM_FILE_OK, file_system_.OpenFileSystem()); ASSERT_EQ(base::PLATFORM_FILE_OK, @@ -69,7 +70,7 @@ class SyncableFileOperationRunnerTest : public testing::Test { } virtual void TearDown() OVERRIDE { - if (sync_context_) + if (sync_context_.get()) sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc index 36e5b6a..f6bbd85 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc +++ b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc @@ -43,12 +43,13 @@ class SyncableFileSystemTest : public testing::Test { sync_context_ = new LocalFileSyncContext(base::MessageLoopProxy::current(), base::MessageLoopProxy::current()); - ASSERT_EQ(sync_file_system::SYNC_STATUS_OK, - file_system_.MaybeInitializeFileSystemContext(sync_context_)); + ASSERT_EQ( + sync_file_system::SYNC_STATUS_OK, + file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); } virtual void TearDown() { - if (sync_context_) + if (sync_context_.get()) sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc index d62deb5..ba35336 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc +++ b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc @@ -132,7 +132,7 @@ TEST(SyncableFileSystemUtilTest, SerializeBeforeOpenFileSystem) { EXPECT_FALSE(deserialized.is_valid()); ASSERT_EQ(sync_file_system::SYNC_STATUS_OK, - file_system.MaybeInitializeFileSystemContext(sync_context)); + file_system.MaybeInitializeFileSystemContext(sync_context.get())); // After initialization this should be ok (even before opening the file // system). diff --git a/webkit/browser/fileapi/test_mount_point_provider.cc b/webkit/browser/fileapi/test_mount_point_provider.cc index 0c87035..3b6fb2f 100644 --- a/webkit/browser/fileapi/test_mount_point_provider.cc +++ b/webkit/browser/fileapi/test_mount_point_provider.cc @@ -80,7 +80,7 @@ TestMountPointProvider::TestMountPointProvider( quota_util_(new QuotaUtil), require_copy_or_move_validator_(false) { UpdateObserverList::Source source; - source.AddObserver(quota_util_.get(), task_runner_); + source.AddObserver(quota_util_.get(), task_runner_.get()); observers_ = UpdateObserverList(source); } diff --git a/webkit/browser/fileapi/transient_file_util_unittest.cc b/webkit/browser/fileapi/transient_file_util_unittest.cc index 58a8046..66be6db 100644 --- a/webkit/browser/fileapi/transient_file_util_unittest.cc +++ b/webkit/browser/fileapi/transient_file_util_unittest.cc @@ -59,7 +59,7 @@ class TransientFileUtilTest : public testing::Test { scoped_ptr<FileSystemOperationContext> NewOperationContext() { return make_scoped_ptr( - new FileSystemOperationContext(file_system_context_)); + new FileSystemOperationContext(file_system_context_.get())); } FileSystemFileUtil* file_util() { return transient_file_util_.get(); } diff --git a/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc b/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc index 6337d50..fc93000 100644 --- a/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc +++ b/webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc @@ -55,9 +55,12 @@ class UploadFileSystemFileElementReaderTest : public testing::Test { &file_modification_time_); // Create and initialize a reader. - reader_.reset(new UploadFileSystemFileElementReader( - file_system_context_, file_url_, 0, kuint64max, - file_modification_time_)); + reader_.reset( + new UploadFileSystemFileElementReader(file_system_context_.get(), + file_url_, + 0, + kuint64max, + file_modification_time_)); net::TestCompletionCallback callback; ASSERT_EQ(net::ERR_IO_PENDING, reader_->Init(callback.callback())); EXPECT_EQ(net::OK, callback.WaitForResult()); @@ -84,7 +87,7 @@ class UploadFileSystemFileElementReaderTest : public testing::Test { fileapi::FileSystemFileUtil* file_util = file_system_context_->GetFileUtil(kFileSystemType); - fileapi::FileSystemOperationContext context(file_system_context_); + fileapi::FileSystemOperationContext context(file_system_context_.get()); context.set_allowed_bytes_growth(1024); base::PlatformFile handle = base::kInvalidPlatformFileValue; @@ -131,13 +134,13 @@ TEST_F(UploadFileSystemFileElementReaderTest, ReadAll) { scoped_refptr<net::IOBufferWithSize> buf = new net::IOBufferWithSize(file_data_.size()); net::TestCompletionCallback read_callback; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback.callback())); EXPECT_EQ(buf->size(), read_callback.WaitForResult()); EXPECT_EQ(0U, reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.end(), buf->data())); // Try to read again. - EXPECT_EQ(0, reader_->Read(buf, buf->size(), read_callback.callback())); + EXPECT_EQ(0, reader_->Read(buf.get(), buf->size(), read_callback.callback())); } TEST_F(UploadFileSystemFileElementReaderTest, ReadPartially) { @@ -148,16 +151,16 @@ TEST_F(UploadFileSystemFileElementReaderTest, ReadPartially) { new net::IOBufferWithSize(kHalfSize); net::TestCompletionCallback read_callback1; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback1.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback1.callback())); EXPECT_EQ(buf->size(), read_callback1.WaitForResult()); EXPECT_EQ(file_data_.size() - buf->size(), reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.begin() + kHalfSize, buf->data())); net::TestCompletionCallback read_callback2; - EXPECT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback2.callback())); + EXPECT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback2.callback())); EXPECT_EQ(buf->size(), read_callback2.WaitForResult()); EXPECT_EQ(0U, reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin() + kHalfSize, file_data_.end(), @@ -169,8 +172,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, ReadTooMuch) { scoped_refptr<net::IOBufferWithSize> buf = new net::IOBufferWithSize(kTooLargeSize); net::TestCompletionCallback read_callback; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback.callback())); EXPECT_EQ(static_cast<int>(file_data_.size()), read_callback.WaitForResult()); EXPECT_EQ(0U, reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.end(), buf->data())); @@ -182,8 +185,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, MultipleInit) { // Read all. net::TestCompletionCallback read_callback1; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback1.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback1.callback())); EXPECT_EQ(buf->size(), read_callback1.WaitForResult()); EXPECT_EQ(0U, reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.end(), buf->data())); @@ -197,8 +200,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, MultipleInit) { // Read again. net::TestCompletionCallback read_callback2; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback2.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback2.callback())); EXPECT_EQ(buf->size(), read_callback2.WaitForResult()); EXPECT_EQ(0U, reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.end(), buf->data())); @@ -210,8 +213,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, InitDuringAsyncOperation) { // Start reading all. net::TestCompletionCallback read_callback1; - EXPECT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback1.callback())); + EXPECT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback1.callback())); // Call Init to cancel the previous read. net::TestCompletionCallback init_callback1; @@ -228,8 +231,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, InitDuringAsyncOperation) { scoped_refptr<net::IOBufferWithSize> buf2 = new net::IOBufferWithSize(file_data_.size() / 2); net::TestCompletionCallback read_callback2; - EXPECT_EQ(net::ERR_IO_PENDING, reader_->Read(buf2, buf2->size(), - read_callback2.callback())); + EXPECT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf2.get(), buf2->size(), read_callback2.callback())); EXPECT_EQ(buf2->size(), read_callback2.WaitForResult()); EXPECT_EQ(file_data_.size() - buf2->size(), reader_->BytesRemaining()); EXPECT_TRUE(std::equal(file_data_.begin(), file_data_.begin() + buf2->size(), @@ -244,7 +247,7 @@ TEST_F(UploadFileSystemFileElementReaderTest, Range) { const int kOffset = 2; const int kLength = file_data_.size() - kOffset * 3; reader_.reset(new UploadFileSystemFileElementReader( - file_system_context_, file_url_, kOffset, kLength, base::Time())); + file_system_context_.get(), file_url_, kOffset, kLength, base::Time())); net::TestCompletionCallback init_callback; ASSERT_EQ(net::ERR_IO_PENDING, reader_->Init(init_callback.callback())); EXPECT_EQ(net::OK, init_callback.WaitForResult()); @@ -252,8 +255,8 @@ TEST_F(UploadFileSystemFileElementReaderTest, Range) { EXPECT_EQ(static_cast<uint64>(kLength), reader_->BytesRemaining()); scoped_refptr<net::IOBufferWithSize> buf = new net::IOBufferWithSize(kLength); net::TestCompletionCallback read_callback; - ASSERT_EQ(net::ERR_IO_PENDING, reader_->Read(buf, buf->size(), - read_callback.callback())); + ASSERT_EQ(net::ERR_IO_PENDING, + reader_->Read(buf.get(), buf->size(), read_callback.callback())); EXPECT_EQ(kLength, read_callback.WaitForResult()); EXPECT_TRUE(std::equal(file_data_.begin() + kOffset, file_data_.begin() + kOffset + kLength, @@ -264,9 +267,12 @@ TEST_F(UploadFileSystemFileElementReaderTest, FileChanged) { // Expect one second before the actual modification time to simulate change. const base::Time expected_modification_time = file_modification_time_ - base::TimeDelta::FromSeconds(1); - reader_.reset(new UploadFileSystemFileElementReader( - file_system_context_, file_url_, 0, kuint64max, - expected_modification_time)); + reader_.reset( + new UploadFileSystemFileElementReader(file_system_context_.get(), + file_url_, + 0, + kuint64max, + expected_modification_time)); net::TestCompletionCallback init_callback; ASSERT_EQ(net::ERR_IO_PENDING, reader_->Init(init_callback.callback())); EXPECT_EQ(net::ERR_UPLOAD_FILE_CHANGED, init_callback.WaitForResult()); @@ -275,7 +281,7 @@ TEST_F(UploadFileSystemFileElementReaderTest, FileChanged) { TEST_F(UploadFileSystemFileElementReaderTest, WrongURL) { const GURL wrong_url = GetFileSystemURL("wrong_file_name.dat"); reader_.reset(new UploadFileSystemFileElementReader( - file_system_context_, wrong_url, 0, kuint64max, base::Time())); + file_system_context_.get(), wrong_url, 0, kuint64max, base::Time())); net::TestCompletionCallback init_callback; ASSERT_EQ(net::ERR_IO_PENDING, reader_->Init(init_callback.callback())); EXPECT_EQ(net::ERR_FILE_NOT_FOUND, init_callback.WaitForResult()); diff --git a/webkit/browser/quota/mock_quota_manager_unittest.cc b/webkit/browser/quota/mock_quota_manager_unittest.cc index 923a1fe..c9d3e9e 100644 --- a/webkit/browser/quota/mock_quota_manager_unittest.cc +++ b/webkit/browser/quota/mock_quota_manager_unittest.cc @@ -42,12 +42,11 @@ class MockQuotaManagerTest : public testing::Test { virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); policy_ = new MockSpecialStoragePolicy; - manager_ = new MockQuotaManager( - false /* is_incognito */, - data_dir_.path(), - base::MessageLoopProxy::current(), - base::MessageLoopProxy::current(), - policy_); + manager_ = new MockQuotaManager(false /* is_incognito */, + data_dir_.path(), + base::MessageLoopProxy::current(), + base::MessageLoopProxy::current(), + policy_.get()); } virtual void TearDown() { diff --git a/webkit/browser/quota/quota_database_unittest.cc b/webkit/browser/quota/quota_database_unittest.cc index e9f2760..3b432e2 100644 --- a/webkit/browser/quota/quota_database_unittest.cc +++ b/webkit/browser/quota/quota_database_unittest.cc @@ -173,8 +173,8 @@ class QuotaDatabaseTest : public testing::Test { new MockSpecialStoragePolicy); policy->AddUnlimited(kOrigin1); policy->AddProtected(kOrigin2); - EXPECT_TRUE(db.GetLRUOrigin(kStorageTypeTemporary, exceptions, - policy, &origin)); + EXPECT_TRUE(db.GetLRUOrigin( + kStorageTypeTemporary, exceptions, policy.get(), &origin)); EXPECT_EQ(kOrigin2.spec(), origin.spec()); exceptions.insert(kOrigin1); diff --git a/webkit/browser/quota/quota_manager.cc b/webkit/browser/quota/quota_manager.cc index 3d3e7d7..fdec99d 100644 --- a/webkit/browser/quota/quota_manager.cc +++ b/webkit/browser/quota/quota_manager.cc @@ -948,12 +948,11 @@ void QuotaManager::GetAvailableSpace(const AvailableSpaceCallback& callback) { if (!available_space_callbacks_.Add(callback)) return; - PostTaskAndReplyWithResult( - db_thread_, - FROM_HERE, - base::Bind(get_disk_space_fn_, profile_path_), - base::Bind(&QuotaManager::DidGetAvailableSpace, - weak_factory_.GetWeakPtr())); + PostTaskAndReplyWithResult(db_thread_.get(), + FROM_HERE, + base::Bind(get_disk_space_fn_, profile_path_), + base::Bind(&QuotaManager::DidGetAvailableSpace, + weak_factory_.GetWeakPtr())); } void QuotaManager::GetTemporaryGlobalQuota(const QuotaCallback& callback) { @@ -1124,19 +1123,16 @@ bool QuotaManager::ResetUsageTracker(StorageType type) { return false; switch (type) { case kStorageTypeTemporary: - temporary_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypeTemporary, - special_storage_policy_)); + temporary_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypeTemporary, special_storage_policy_.get())); return true; case kStorageTypePersistent: - persistent_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypePersistent, - special_storage_policy_)); + persistent_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypePersistent, special_storage_policy_.get())); return true; case kStorageTypeSyncable: - syncable_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypeSyncable, - special_storage_policy_)); + syncable_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypeSyncable, special_storage_policy_.get())); return true; default: NOTREACHED(); @@ -1170,15 +1166,12 @@ void QuotaManager::LazyInitialize() { database_.reset(new QuotaDatabase(is_incognito_ ? base::FilePath() : profile_path_.AppendASCII(kDatabaseName))); - temporary_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypeTemporary, - special_storage_policy_)); - persistent_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypePersistent, - special_storage_policy_)); - syncable_usage_tracker_.reset( - new UsageTracker(clients_, kStorageTypeSyncable, - special_storage_policy_)); + temporary_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypeTemporary, special_storage_policy_.get())); + persistent_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypePersistent, special_storage_policy_.get())); + syncable_usage_tracker_.reset(new UsageTracker( + clients_, kStorageTypeSyncable, special_storage_policy_.get())); int64* temporary_quota_override = new int64(-1); int64* desired_available_space = new int64(-1); @@ -1340,8 +1333,10 @@ void QuotaManager::DidGetTemporaryGlobalUsageForHistogram( size_t num_origins = origins.size(); size_t protected_origins = 0; size_t unlimited_origins = 0; - CountOriginType(origins, special_storage_policy_, - &protected_origins, &unlimited_origins); + CountOriginType(origins, + special_storage_policy_.get(), + &protected_origins, + &unlimited_origins); UMA_HISTOGRAM_COUNTS("Quota.NumberOfTemporaryStorageOrigins", num_origins); @@ -1362,8 +1357,10 @@ void QuotaManager::DidGetPersistentGlobalUsageForHistogram( size_t num_origins = origins.size(); size_t protected_origins = 0; size_t unlimited_origins = 0; - CountOriginType(origins, special_storage_policy_, - &protected_origins, &unlimited_origins); + CountOriginType(origins, + special_storage_policy_.get(), + &protected_origins, + &unlimited_origins); UMA_HISTOGRAM_COUNTS("Quota.NumberOfPersistentStorageOrigins", num_origins); @@ -1556,7 +1553,7 @@ void QuotaManager::PostTaskAndReplyWithResultForDBThread( // |database_|, therefore we can be sure that database_ is alive when this // task runs. base::PostTaskAndReplyWithResult( - db_thread_, + db_thread_.get(), from_here, base::Bind(task, base::Unretained(database_.get())), reply); @@ -1653,7 +1650,7 @@ void QuotaManagerProxy::SetUsageCacheEnabled(QuotaClient::ID client_id, } QuotaManager* QuotaManagerProxy::quota_manager() const { - DCHECK(!io_thread_ || io_thread_->BelongsToCurrentThread()); + DCHECK(!io_thread_.get() || io_thread_->BelongsToCurrentThread()); return manager_; } diff --git a/webkit/browser/quota/quota_manager_unittest.cc b/webkit/browser/quota/quota_manager_unittest.cc index 4d902d0..987a098 100644 --- a/webkit/browser/quota/quota_manager_unittest.cc +++ b/webkit/browser/quota/quota_manager_unittest.cc @@ -74,12 +74,11 @@ class QuotaManagerTest : public testing::Test { protected: void ResetQuotaManager(bool is_incognito) { - quota_manager_ = new QuotaManager( - is_incognito, - data_dir_.path(), - MessageLoopProxy::current(), - MessageLoopProxy::current(), - mock_special_storage_policy_); + quota_manager_ = new QuotaManager(is_incognito, + data_dir_.path(), + MessageLoopProxy::current(), + MessageLoopProxy::current(), + mock_special_storage_policy_.get()); // Don't (automatically) start the eviction for testing. quota_manager_->eviction_disabled_ = true; // Don't query the hard disk for remaining capacity. diff --git a/webkit/browser/quota/quota_task.h b/webkit/browser/quota/quota_task.h index 0f245d6..ba2ef5f 100644 --- a/webkit/browser/quota/quota_task.h +++ b/webkit/browser/quota/quota_task.h @@ -48,7 +48,7 @@ class QuotaTask { QuotaTaskObserver* observer() const { return observer_; } base::SingleThreadTaskRunner* original_task_runner() const { - return original_task_runner_; + return original_task_runner_.get(); } private: diff --git a/webkit/browser/quota/usage_tracker.cc b/webkit/browser/quota/usage_tracker.cc index 07f6b16..6f9f135 100644 --- a/webkit/browser/quota/usage_tracker.cc +++ b/webkit/browser/quota/usage_tracker.cc @@ -279,12 +279,12 @@ ClientUsageTracker::ClientUsageTracker( special_storage_policy_(special_storage_policy) { DCHECK(tracker_); DCHECK(client_); - if (special_storage_policy_) + if (special_storage_policy_.get()) special_storage_policy_->AddObserver(this); } ClientUsageTracker::~ClientUsageTracker() { - if (special_storage_policy_) + if (special_storage_policy_.get()) special_storage_policy_->RemoveObserver(this); } diff --git a/webkit/common/blob/scoped_file.cc b/webkit/common/blob/scoped_file.cc index 0198728..df1d3d4 100644 --- a/webkit/common/blob/scoped_file.cc +++ b/webkit/common/blob/scoped_file.cc @@ -63,7 +63,9 @@ void ScopedFile::Reset() { } if (scope_out_policy_ == DELETE_ON_SCOPE_OUT) { - base::FileUtilProxy::Delete(file_task_runner_, path_, false /* recursive */, + base::FileUtilProxy::Delete(file_task_runner_.get(), + path_, + false /* recursive */, base::FileUtilProxy::StatusCallback()); } diff --git a/webkit/common/blob/shareable_file_reference_unittest.cc b/webkit/common/blob/shareable_file_reference_unittest.cc index df81e00..3ee2cd8 100644 --- a/webkit/common/blob/shareable_file_reference_unittest.cc +++ b/webkit/common/blob/shareable_file_reference_unittest.cc @@ -29,7 +29,7 @@ TEST(ShareableFileReferenceTest, TestReferences) { reference1 = ShareableFileReference::Get(file); EXPECT_FALSE(reference1.get()); reference1 = ShareableFileReference::GetOrCreate( - file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy); + file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy.get()); EXPECT_TRUE(reference1.get()); EXPECT_TRUE(file == reference1->path()); @@ -38,7 +38,7 @@ TEST(ShareableFileReferenceTest, TestReferences) { reference2 = ShareableFileReference::Get(file); EXPECT_EQ(reference1.get(), reference2.get()); reference2 = ShareableFileReference::GetOrCreate( - file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy); + file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy.get()); EXPECT_EQ(reference1.get(), reference2.get()); // Drop the first reference, the file and reference should still be there. diff --git a/webkit/common/gpu/test_context_provider_factory.cc b/webkit/common/gpu/test_context_provider_factory.cc index 69ae385..09017b6 100644 --- a/webkit/common/gpu/test_context_provider_factory.cc +++ b/webkit/common/gpu/test_context_provider_factory.cc @@ -26,9 +26,9 @@ TestContextProviderFactory::~TestContextProviderFactory() {} scoped_refptr<cc::ContextProvider> TestContextProviderFactory:: OffscreenContextProviderForMainThread() { - if (!main_thread_ || main_thread_->DestroyedOnMainThread()) { + if (!main_thread_.get() || main_thread_->DestroyedOnMainThread()) { main_thread_ = ContextProviderInProcess::Create(); - if (main_thread_ && !main_thread_->BindToCurrentThread()) + if (main_thread_.get() && !main_thread_->BindToCurrentThread()) main_thread_ = NULL; } return main_thread_; @@ -36,8 +36,7 @@ scoped_refptr<cc::ContextProvider> TestContextProviderFactory:: scoped_refptr<cc::ContextProvider> TestContextProviderFactory:: OffscreenContextProviderForCompositorThread() { - if (!compositor_thread_ || - compositor_thread_->DestroyedOnMainThread()) + if (!compositor_thread_.get() || compositor_thread_->DestroyedOnMainThread()) compositor_thread_ = ContextProviderInProcess::Create(); return compositor_thread_; } diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 96d1a6f..8488020 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -352,7 +352,7 @@ scoped_ptr<GpuMemoryBuffer> ImageFactoryInProcess::CreateGpuMemoryBuffer( gfx::GLImage::CreateGLImageForGpuMemoryBuffer(buffer->GetNativeBuffer(), gfx::Size(width, height)); *image_id = ++next_id_; // Valid image_ids start from 1. - image_manager_->AddImage(gl_image, *image_id); + image_manager_->AddImage(gl_image.get(), *image_id); return buffer.Pass(); } @@ -604,7 +604,7 @@ bool GLInProcessContext::Initialize( else surface_ = gfx::GLSurface::CreateViewGLSurface(false, window); - if (!surface_) { + if (!surface_.get()) { LOG(ERROR) << "Could not create GLSurface."; Destroy(); return false; @@ -612,17 +612,15 @@ bool GLInProcessContext::Initialize( if (g_use_virtualized_gl_context) { context_ = share_group->GetSharedContext(); - if (!context_) { - context_ = gfx::GLContext::CreateGLContext(share_group.get(), - surface_.get(), - gpu_preference); - share_group->SetSharedContext(context_); + if (!context_.get()) { + context_ = gfx::GLContext::CreateGLContext( + share_group.get(), surface_.get(), gpu_preference); + share_group->SetSharedContext(context_.get()); } - context_ = new ::gpu::GLContextVirtual(share_group.get(), - context_, - decoder_->AsWeakPtr()); - if (context_->Initialize(surface_, gpu_preference)) { + context_ = new ::gpu::GLContextVirtual( + share_group.get(), context_.get(), decoder_->AsWeakPtr()); + if (context_->Initialize(surface_.get(), gpu_preference)) { VLOG(1) << "Created virtual GL context."; } else { context_ = NULL; @@ -633,13 +631,13 @@ bool GLInProcessContext::Initialize( gpu_preference); } - if (!context_) { + if (!context_.get()) { LOG(ERROR) << "Could not create GLContext."; Destroy(); return false; } - if (!context_->MakeCurrent(surface_)) { + if (!context_->MakeCurrent(surface_.get())) { LOG(ERROR) << "Could not make context current."; Destroy(); return false; @@ -707,7 +705,7 @@ bool GLInProcessContext::Initialize( transfer_buffer_.get(), true, false, - image_factory_)); + image_factory_.get())); if (!gles2_implementation_->Initialize( kStartTransferBufferSize, diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc index 50231df..7055976 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc @@ -125,7 +125,7 @@ WebGraphicsContext3DInProcessImpl::CreateForWindow( scoped_refptr<gfx::GLSurface> gl_surface = gfx::GLSurface::CreateViewGLSurface(false, window); - if (!gl_surface) + if (!gl_surface.get()) return NULL; gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; @@ -134,7 +134,7 @@ WebGraphicsContext3DInProcessImpl::CreateForWindow( share_group, gl_surface.get(), gpu_preference); - if (!gl_context) + if (!gl_context.get()) return NULL; scoped_ptr<WebGraphicsContext3DInProcessImpl> context( new WebGraphicsContext3DInProcessImpl( @@ -162,7 +162,7 @@ bool WebGraphicsContext3DInProcessImpl::Initialize( if (render_directly_to_web_view_) attributes_.antialias = false; - if (!gl_context_->MakeCurrent(gl_surface_)) { + if (!gl_context_->MakeCurrent(gl_surface_.get())) { gl_context_ = NULL; return false; } diff --git a/webkit/dom_storage/dom_storage_area.cc b/webkit/dom_storage/dom_storage_area.cc index 269f3f7..24ee155 100644 --- a/webkit/dom_storage/dom_storage_area.cc +++ b/webkit/dom_storage/dom_storage_area.cc @@ -201,9 +201,11 @@ DomStorageArea* DomStorageArea::ShallowCopy( DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); DCHECK_NE(kLocalStorageNamespaceId, destination_namespace_id); - DomStorageArea* copy = new DomStorageArea( - destination_namespace_id, destination_persistent_namespace_id, origin_, - session_storage_backing_, task_runner_); + DomStorageArea* copy = new DomStorageArea(destination_namespace_id, + destination_persistent_namespace_id, + origin_, + session_storage_backing_.get(), + task_runner_.get()); copy->map_ = map_; copy->is_shutdown_ = is_shutdown_; copy->is_initial_import_done_ = true; diff --git a/webkit/dom_storage/dom_storage_cached_area.cc b/webkit/dom_storage/dom_storage_cached_area.cc index da15b0e..0e2aae6 100644 --- a/webkit/dom_storage/dom_storage_cached_area.cc +++ b/webkit/dom_storage/dom_storage_cached_area.cc @@ -91,7 +91,7 @@ void DomStorageCachedArea::Clear(int connection_id, const GURL& page_url) { void DomStorageCachedArea::ApplyMutation( const NullableString16& key, const NullableString16& new_value) { - if (!map_ || ignore_all_mutations_) + if (!map_.get() || ignore_all_mutations_) return; if (key.is_null()) { @@ -135,11 +135,11 @@ void DomStorageCachedArea::ApplyMutation( } size_t DomStorageCachedArea::MemoryBytesUsedByCache() const { - return map_ ? map_->bytes_used() : 0; + return map_.get() ? map_->bytes_used() : 0; } void DomStorageCachedArea::Prime(int connection_id) { - DCHECK(!map_); + DCHECK(!map_.get()); // The LoadArea method is actually synchronous, but we have to // wait for an asyncly delivered message to know when incoming diff --git a/webkit/dom_storage/dom_storage_cached_area.h b/webkit/dom_storage/dom_storage_cached_area.h index 81e8467..c1d9db1 100644 --- a/webkit/dom_storage/dom_storage_cached_area.h +++ b/webkit/dom_storage/dom_storage_cached_area.h @@ -57,7 +57,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageCachedArea : // Primes the cache, loading all values for the area. void Prime(int connection_id); void PrimeIfNeeded(int connection_id) { - if (!map_) + if (!map_.get()) Prime(connection_id); } diff --git a/webkit/dom_storage/dom_storage_cached_area_unittest.cc b/webkit/dom_storage/dom_storage_cached_area_unittest.cc index d55d73f..46880e08 100644 --- a/webkit/dom_storage/dom_storage_cached_area_unittest.cc +++ b/webkit/dom_storage/dom_storage_cached_area_unittest.cc @@ -152,15 +152,15 @@ class DomStorageCachedAreaTest : public testing::Test { TEST_F(DomStorageCachedAreaTest, Basics) { EXPECT_TRUE(mock_proxy_->HasOneRef()); scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); EXPECT_EQ(kNamespaceId, cached_area->namespace_id()); EXPECT_EQ(kOrigin, cached_area->origin()); EXPECT_FALSE(mock_proxy_->HasOneRef()); cached_area->ApplyMutation(NullableString16(kKey, false), NullableString16(kValue, false)); - EXPECT_FALSE(IsPrimed(cached_area)); + EXPECT_FALSE(IsPrimed(cached_area.get())); - ResetAll(cached_area); + ResetAll(cached_area.get()); EXPECT_EQ(kNamespaceId, cached_area->namespace_id()); EXPECT_EQ(kOrigin, cached_area->origin()); @@ -177,33 +177,33 @@ TEST_F(DomStorageCachedAreaTest, Basics) { TEST_F(DomStorageCachedAreaTest, Getters) { const int kConnectionId = 7; scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); // GetLength, we expect to see one call to load in the proxy. - EXPECT_FALSE(IsPrimed(cached_area)); + EXPECT_FALSE(IsPrimed(cached_area.get())); EXPECT_EQ(0u, cached_area->GetLength(kConnectionId)); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size()); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); mock_proxy_->CompleteAllPendingCallbacks(); - EXPECT_FALSE(IsIgnoringAllMutations(cached_area)); + EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get())); // GetKey, expect the one call to load. - ResetAll(cached_area); - EXPECT_FALSE(IsPrimed(cached_area)); + ResetAll(cached_area.get()); + EXPECT_FALSE(IsPrimed(cached_area.get())); EXPECT_TRUE(cached_area->GetKey(kConnectionId, 2).is_null()); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size()); // GetItem, ditto. - ResetAll(cached_area); - EXPECT_FALSE(IsPrimed(cached_area)); + ResetAll(cached_area.get()); + EXPECT_FALSE(IsPrimed(cached_area.get())); EXPECT_TRUE(cached_area->GetItem(kConnectionId, kKey).is_null()); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size()); @@ -212,13 +212,13 @@ TEST_F(DomStorageCachedAreaTest, Getters) { TEST_F(DomStorageCachedAreaTest, Setters) { const int kConnectionId = 7; scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); // SetItem, we expect a call to load followed by a call to set item // in the proxy. - EXPECT_FALSE(IsPrimed(cached_area)); + EXPECT_FALSE(IsPrimed(cached_area.get())); EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl)); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_TRUE(mock_proxy_->observed_set_item_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); @@ -229,20 +229,20 @@ TEST_F(DomStorageCachedAreaTest, Setters) { // Clear, we expect a just the one call to clear in the proxy since // there's no need to load the data prior to deleting it. - ResetAll(cached_area); - EXPECT_FALSE(IsPrimed(cached_area)); + ResetAll(cached_area.get()); + EXPECT_FALSE(IsPrimed(cached_area.get())); cached_area->Clear(kConnectionId, kPageUrl); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_clear_area_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); EXPECT_EQ(kPageUrl, mock_proxy_->observed_page_url_); EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size()); // RemoveItem with nothing to remove, expect just one call to load. - ResetAll(cached_area); - EXPECT_FALSE(IsPrimed(cached_area)); + ResetAll(cached_area.get()); + EXPECT_FALSE(IsPrimed(cached_area.get())); cached_area->RemoveItem(kConnectionId, kKey, kPageUrl); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_FALSE(mock_proxy_->observed_remove_item_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); @@ -250,11 +250,11 @@ TEST_F(DomStorageCachedAreaTest, Setters) { // RemoveItem with something to remove, expect a call to load followed // by a call to remove. - ResetAll(cached_area); + ResetAll(cached_area.get()); mock_proxy_->load_area_return_values_[kKey] = NullableString16(kValue, false); - EXPECT_FALSE(IsPrimed(cached_area)); + EXPECT_FALSE(IsPrimed(cached_area.get())); cached_area->RemoveItem(kConnectionId, kKey, kPageUrl); - EXPECT_TRUE(IsPrimed(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); EXPECT_TRUE(mock_proxy_->observed_load_area_); EXPECT_TRUE(mock_proxy_->observed_remove_item_); EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_); @@ -266,10 +266,10 @@ TEST_F(DomStorageCachedAreaTest, Setters) { TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilLoadCompletion) { const int kConnectionId = 7; scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); EXPECT_TRUE(cached_area->GetItem(kConnectionId, kKey).is_null()); - EXPECT_TRUE(IsPrimed(cached_area)); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsPrimed(cached_area.get())); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); // Before load completion, the mutation should be ignored. cached_area->ApplyMutation(NullableString16(kKey, false), @@ -278,7 +278,7 @@ TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilLoadCompletion) { // Call the load completion callback. mock_proxy_->CompleteOnePendingCallback(true); - EXPECT_FALSE(IsIgnoringAllMutations(cached_area)); + EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get())); // Verify that mutations are now applied. cached_area->ApplyMutation(NullableString16(kKey, false), @@ -289,61 +289,61 @@ TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilLoadCompletion) { TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilClearCompletion) { const int kConnectionId = 4; scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); cached_area->Clear(kConnectionId, kPageUrl); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); mock_proxy_->CompleteOnePendingCallback(true); - EXPECT_FALSE(IsIgnoringAllMutations(cached_area)); + EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get())); // Verify that calling Clear twice works as expected, the first // completion callback should have been cancelled. - ResetCacheOnly(cached_area); + ResetCacheOnly(cached_area.get()); cached_area->Clear(kConnectionId, kPageUrl); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); cached_area->Clear(kConnectionId, kPageUrl); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); mock_proxy_->CompleteOnePendingCallback(true); - EXPECT_TRUE(IsIgnoringAllMutations(cached_area)); + EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get())); mock_proxy_->CompleteOnePendingCallback(true); - EXPECT_FALSE(IsIgnoringAllMutations(cached_area)); + EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get())); } TEST_F(DomStorageCachedAreaTest, KeyMutationsAreIgnoredUntilCompletion) { const int kConnectionId = 8; scoped_refptr<DomStorageCachedArea> cached_area = - new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_); + new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get()); // SetItem EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl)); mock_proxy_->CompleteOnePendingCallback(true); // load completion - EXPECT_FALSE(IsIgnoringAllMutations(cached_area)); - EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get())); + EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey)); cached_area->ApplyMutation(NullableString16(kKey, false), NullableString16(true)); EXPECT_EQ(kValue, cached_area->GetItem(kConnectionId, kKey).string()); mock_proxy_->CompleteOnePendingCallback(true); // set completion - EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey)); // RemoveItem cached_area->RemoveItem(kConnectionId, kKey, kPageUrl); - EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey)); mock_proxy_->CompleteOnePendingCallback(true); // remove completion - EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey)); // Multiple mutations to the same key. EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl)); cached_area->RemoveItem(kConnectionId, kKey, kPageUrl); - EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey)); mock_proxy_->CompleteOnePendingCallback(true); // set completion - EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey)); mock_proxy_->CompleteOnePendingCallback(true); // remove completion - EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey)); // A failed set item operation should Reset the cache. EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl)); - EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey)); + EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey)); mock_proxy_->CompleteOnePendingCallback(false); - EXPECT_FALSE(IsPrimed(cached_area)); + EXPECT_FALSE(IsPrimed(cached_area.get())); } } // namespace dom_storage diff --git a/webkit/dom_storage/dom_storage_context.cc b/webkit/dom_storage/dom_storage_context.cc index ccad089..70e06e7 100644 --- a/webkit/dom_storage/dom_storage_context.cc +++ b/webkit/dom_storage/dom_storage_context.cc @@ -43,7 +43,7 @@ DomStorageContext::DomStorageContext( } DomStorageContext::~DomStorageContext() { - if (session_storage_database_) { + if (session_storage_database_.get()) { // SessionStorageDatabase shouldn't be deleted right away: deleting it will // potentially involve waiting in leveldb::DBImpl::~DBImpl, and waiting // shouldn't happen on this thread. @@ -73,13 +73,13 @@ DomStorageNamespace* DomStorageContext::GetStorageNamespace( } } DomStorageNamespace* local = - new DomStorageNamespace(localstorage_directory_, task_runner_); + new DomStorageNamespace(localstorage_directory_, task_runner_.get()); namespaces_[kLocalStorageNamespaceId] = local; return local; } return NULL; } - return found->second; + return found->second.get(); } void DomStorageContext::GetLocalStorageUsage( @@ -107,7 +107,7 @@ void DomStorageContext::GetLocalStorageUsage( void DomStorageContext::GetSessionStorageUsage( std::vector<SessionStorageUsageInfo>* infos) { - if (!session_storage_database_) + if (!session_storage_database_.get()) return; std::map<std::string, std::vector<GURL> > namespaces_and_origins; session_storage_database_->ReadNamespacesAndOrigins( @@ -176,7 +176,7 @@ void DomStorageContext::Shutdown() { for (; it != namespaces_.end(); ++it) it->second->Shutdown(); - if (localstorage_directory_.empty() && !session_storage_database_) + if (localstorage_directory_.empty() && !session_storage_database_.get()) return; // Respect the content policy settings about what to @@ -250,9 +250,11 @@ void DomStorageContext::CreateSessionNamespace( return; DCHECK(namespace_id != kLocalStorageNamespaceId); DCHECK(namespaces_.find(namespace_id) == namespaces_.end()); - namespaces_[namespace_id] = new DomStorageNamespace( - namespace_id, persistent_namespace_id, session_storage_database_.get(), - task_runner_); + namespaces_[namespace_id] = + new DomStorageNamespace(namespace_id, + persistent_namespace_id, + session_storage_database_.get(), + task_runner_.get()); persistent_namespace_id_to_namespace_id_[persistent_namespace_id] = namespace_id; } @@ -264,7 +266,7 @@ void DomStorageContext::DeleteSessionNamespace( if (it == namespaces_.end()) return; std::string persistent_namespace_id = it->second->persistent_namespace_id(); - if (session_storage_database_) { + if (session_storage_database_.get()) { if (!should_persist_data) { task_runner_->PostShutdownBlockingTask( FROM_HERE, @@ -321,7 +323,7 @@ void DomStorageContext::ClearSessionOnlyOrigins() { kNotRecursive); } } - if (session_storage_database_) { + if (session_storage_database_.get()) { std::vector<SessionStorageUsageInfo> infos; GetSessionStorageUsage(&infos); for (size_t i = 0; i < infos.size(); ++i) { @@ -345,9 +347,10 @@ void DomStorageContext::SetSaveSessionStorageOnDisk() { } void DomStorageContext::StartScavengingUnusedSessionStorage() { - if (session_storage_database_) { + if (session_storage_database_.get()) { task_runner_->PostDelayedTask( - FROM_HERE, base::Bind(&DomStorageContext::FindUnusedNamespaces, this), + FROM_HERE, + base::Bind(&DomStorageContext::FindUnusedNamespaces, this), base::TimeDelta::FromSeconds(kSessionStoraceScavengingSeconds)); } } diff --git a/webkit/dom_storage/dom_storage_context.h b/webkit/dom_storage/dom_storage_context.h index 33ae2c5..eaa3a27 100644 --- a/webkit/dom_storage/dom_storage_context.h +++ b/webkit/dom_storage/dom_storage_context.h @@ -101,7 +101,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageContext return sessionstorage_directory_; } - DomStorageTaskRunner* task_runner() const { return task_runner_; } + DomStorageTaskRunner* task_runner() const { return task_runner_.get(); } DomStorageNamespace* GetStorageNamespace(int64 namespace_id); void GetLocalStorageUsage(std::vector<LocalStorageUsageInfo>* infos, diff --git a/webkit/dom_storage/dom_storage_context_unittest.cc b/webkit/dom_storage/dom_storage_context_unittest.cc index 84e8649..ddbed35 100644 --- a/webkit/dom_storage/dom_storage_context_unittest.cc +++ b/webkit/dom_storage/dom_storage_context_unittest.cc @@ -43,8 +43,8 @@ class DomStorageContextTest : public testing::Test { base::MessageLoopProxy::current()); context_ = new DomStorageContext(temp_dir_.path(), base::FilePath(), - storage_policy_, - task_runner_); + storage_policy_.get(), + task_runner_.get()); } virtual void TearDown() { @@ -192,8 +192,8 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { // Create a DomStorageContext which will save sessionStorage on disk. context_ = new DomStorageContext(temp_dir_.path(), temp_dir_.path(), - storage_policy_, - task_runner_); + storage_policy_.get(), + task_runner_.get()); context_->SetSaveSessionStorageOnDisk(); ASSERT_EQ(temp_dir_.path(), context_->sessionstorage_directory()); @@ -215,8 +215,10 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { context_->Shutdown(); context_ = NULL; base::MessageLoop::current()->RunUntilIdle(); - context_ = new DomStorageContext( - temp_dir_.path(), temp_dir_.path(), storage_policy_, task_runner_); + context_ = new DomStorageContext(temp_dir_.path(), + temp_dir_.path(), + storage_policy_.get(), + task_runner_.get()); context_->SetSaveSessionStorageOnDisk(); // Read the data back. @@ -238,8 +240,10 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { context_->Shutdown(); context_ = NULL; base::MessageLoop::current()->RunUntilIdle(); - context_ = new DomStorageContext( - temp_dir_.path(), temp_dir_.path(), storage_policy_, task_runner_); + context_ = new DomStorageContext(temp_dir_.path(), + temp_dir_.path(), + storage_policy_.get(), + task_runner_.get()); context_->SetSaveSessionStorageOnDisk(); // Now there should be no data. diff --git a/webkit/dom_storage/dom_storage_host.cc b/webkit/dom_storage/dom_storage_host.cc index 7f4fca1..4d53d7a 100644 --- a/webkit/dom_storage/dom_storage_host.cc +++ b/webkit/dom_storage/dom_storage_host.cc @@ -19,7 +19,7 @@ DomStorageHost::DomStorageHost(DomStorageContext* context) DomStorageHost::~DomStorageHost() { AreaMap::const_iterator it = connections_.begin(); for (; it != connections_.end(); ++it) - it->second.namespace_->CloseStorageArea(it->second.area_); + it->second.namespace_->CloseStorageArea(it->second.area_.get()); connections_.clear(); // Clear prior to releasing the context_ } @@ -30,14 +30,14 @@ bool DomStorageHost::OpenStorageArea(int connection_id, int namespace_id, return false; // Indicates the renderer gave us very bad data. NamespaceAndArea references; references.namespace_ = context_->GetStorageNamespace(namespace_id); - if (!references.namespace_) { + if (!references.namespace_.get()) { // TODO(michaeln): Fix crbug/134003 and return false here. // Until then return true to avoid crashing the renderer for // sending a bad message. return true; } references.area_ = references.namespace_->OpenStorageArea(origin); - DCHECK(references.area_); + DCHECK(references.area_.get()); connections_[connection_id] = references; return true; } @@ -46,8 +46,7 @@ void DomStorageHost::CloseStorageArea(int connection_id) { AreaMap::iterator found = connections_.find(connection_id); if (found == connections_.end()) return; - found->second.namespace_->CloseStorageArea( - found->second.area_); + found->second.namespace_->CloseStorageArea(found->second.area_.get()); connections_.erase(found); } @@ -152,14 +151,14 @@ DomStorageArea* DomStorageHost::GetOpenArea(int connection_id) { AreaMap::iterator found = connections_.find(connection_id); if (found == connections_.end()) return NULL; - return found->second.area_; + return found->second.area_.get(); } DomStorageNamespace* DomStorageHost::GetNamespace(int connection_id) { AreaMap::iterator found = connections_.find(connection_id); if (found == connections_.end()) return NULL; - return found->second.namespace_; + return found->second.namespace_.get(); } // NamespaceAndArea diff --git a/webkit/dom_storage/dom_storage_namespace.cc b/webkit/dom_storage/dom_storage_namespace.cc index 1128ca3..3872cb5 100644 --- a/webkit/dom_storage/dom_storage_namespace.cc +++ b/webkit/dom_storage/dom_storage_namespace.cc @@ -41,14 +41,17 @@ DomStorageNamespace::~DomStorageNamespace() { DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) { if (AreaHolder* holder = GetAreaHolder(origin)) { ++(holder->open_count_); - return holder->area_; + return holder->area_.get(); } DomStorageArea* area; if (namespace_id_ == kLocalStorageNamespaceId) { - area = new DomStorageArea(origin, directory_, task_runner_); + area = new DomStorageArea(origin, directory_, task_runner_.get()); } else { - area = new DomStorageArea(namespace_id_, persistent_namespace_id_, origin, - session_storage_database_, task_runner_); + area = new DomStorageArea(namespace_id_, + persistent_namespace_id_, + origin, + session_storage_database_.get(), + task_runner_.get()); } areas_[origin] = AreaHolder(area, 1); return area; @@ -66,7 +69,7 @@ void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) { DomStorageArea* DomStorageNamespace::GetOpenStorageArea(const GURL& origin) { AreaHolder* holder = GetAreaHolder(origin); if (holder && holder->open_count_) - return holder->area_; + return holder->area_.get(); return NULL; } @@ -75,9 +78,11 @@ DomStorageNamespace* DomStorageNamespace::Clone( const std::string& clone_persistent_namespace_id) { DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id); - DomStorageNamespace* clone = new DomStorageNamespace( - clone_namespace_id, clone_persistent_namespace_id, - session_storage_database_, task_runner_); + DomStorageNamespace* clone = + new DomStorageNamespace(clone_namespace_id, + clone_persistent_namespace_id, + session_storage_database_.get(), + task_runner_.get()); AreaMap::const_iterator it = areas_.begin(); // Clone the in-memory structures. for (; it != areas_.end(); ++it) { @@ -86,12 +91,13 @@ DomStorageNamespace* DomStorageNamespace::Clone( clone->areas_[it->first] = AreaHolder(area, 0); } // And clone the on-disk structures, too. - if (session_storage_database_) { + if (session_storage_database_.get()) { task_runner_->PostShutdownBlockingTask( FROM_HERE, DomStorageTaskRunner::COMMIT_SEQUENCE, base::Bind(base::IgnoreResult(&SessionStorageDatabase::CloneNamespace), - session_storage_database_.get(), persistent_namespace_id_, + session_storage_database_.get(), + persistent_namespace_id_, clone_persistent_namespace_id)); } return clone; @@ -106,7 +112,7 @@ void DomStorageNamespace::DeleteLocalStorageOrigin(const GURL& origin) { } if (!directory_.empty()) { scoped_refptr<DomStorageArea> area = - new DomStorageArea(origin, directory_, task_runner_); + new DomStorageArea(origin, directory_, task_runner_.get()); area->DeleteOrigin(); } } diff --git a/webkit/dom_storage/dom_storage_session.cc b/webkit/dom_storage/dom_storage_session.cc index 76b58a4..71eb021 100644 --- a/webkit/dom_storage/dom_storage_session.cc +++ b/webkit/dom_storage/dom_storage_session.cc @@ -49,7 +49,7 @@ bool DomStorageSession::IsFromContext(DomStorageContext* context) { } DomStorageSession* DomStorageSession::Clone() { - return CloneFrom(context_, namespace_id_); + return CloneFrom(context_.get(), namespace_id_); } // static diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc index ecb7278..7577a26 100644 --- a/webkit/glue/resource_request_body_unittest.cc +++ b/webkit/glue/resource_request_body_unittest.cc @@ -102,14 +102,14 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { scoped_refptr<BlobData> blob_data(new BlobData()); GURL blob_url0("blob://url_0"); - blob_storage_controller.AddFinishedBlob(blob_url0, blob_data); + blob_storage_controller.AddFinishedBlob(blob_url0, blob_data.get()); blob_data->AppendData("BlobData"); blob_data->AppendFile( base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1); GURL blob_url1("blob://url_1"); - blob_storage_controller.AddFinishedBlob(blob_url1, blob_data); + blob_storage_controller.AddFinishedBlob(blob_url1, blob_data.get()); GURL blob_url2("blob://url_2"); blob_storage_controller.CloneBlob(blob_url2, blob_url1); diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index 0d33d2e8..c4d9e52 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -829,10 +829,10 @@ WebKit::WebThread* WebKitPlatformSupportImpl::currentThread() { scoped_refptr<base::MessageLoopProxy> message_loop = base::MessageLoopProxy::current(); - if (!message_loop) + if (!message_loop.get()) return NULL; - thread = new WebThreadImplForMessageLoop(message_loop); + thread = new WebThreadImplForMessageLoop(message_loop.get()); current_thread_slot_.Set(thread); return thread; } diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc index 3a68cbb..9d6ac9d 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/glue/websocketstreamhandle_impl.cc @@ -64,7 +64,7 @@ class WebSocketStreamHandleImpl::Context virtual ~Context() { DCHECK(!handle_); DCHECK(!client_); - DCHECK(!bridge_); + DCHECK(!bridge_.get()); } WebSocketStreamHandleImpl* handle_; @@ -86,7 +86,7 @@ void WebSocketStreamHandleImpl::Context::Connect( const WebURL& url, WebKitPlatformSupportImpl* platform) { VLOG(1) << "Connect url=" << url; - DCHECK(!bridge_); + DCHECK(!bridge_.get()); bridge_ = platform->CreateWebSocketBridge(handle_, this); AddRef(); // Will be released by DidClose(). bridge_->Connect(url); @@ -94,14 +94,14 @@ void WebSocketStreamHandleImpl::Context::Connect( bool WebSocketStreamHandleImpl::Context::Send(const WebData& data) { VLOG(1) << "Send data.size=" << data.size(); - DCHECK(bridge_); + DCHECK(bridge_.get()); return bridge_->Send( std::vector<char>(data.data(), data.data() + data.size())); } void WebSocketStreamHandleImpl::Context::Close() { VLOG(1) << "Close"; - if (bridge_) + if (bridge_.get()) bridge_->Close(); } @@ -112,7 +112,7 @@ void WebSocketStreamHandleImpl::Context::Detach() { // the |bridge_| here. Then |bridge_| will call back DidClose, and will // be released by itself. // Otherwise, |bridge_| is NULL. - if (bridge_) + if (bridge_.get()) bridge_->Close(); } diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index fcfeb8c..1916ffc 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -222,7 +222,7 @@ void PopulateURLResponse( response->setLoadTiming(timing); } - if (info.devtools_info) { + if (info.devtools_info.get()) { WebHTTPLoadInfo load_info; load_info.setHTTPStatusCode(info.devtools_info->http_status_code); @@ -250,7 +250,7 @@ void PopulateURLResponse( response->setHTTPLoadInfo(load_info); } - const net::HttpResponseHeaders* headers = info.headers; + const net::HttpResponseHeaders* headers = info.headers.get(); if (!headers) return; @@ -552,7 +552,7 @@ void WebURLLoaderImpl::Context::Start( } } request_body->set_identifier(request.httpBody().identifier()); - bridge_->SetRequestBody(request_body); + bridge_->SetRequestBody(request_body.get()); } if (sync_load_response) { @@ -646,7 +646,7 @@ void WebURLLoaderImpl::Context::OnReceivedResponse( DCHECK(!ftp_listing_delegate_.get()); DCHECK(!multipart_delegate_.get()); - if (info.headers && info.mime_type == "multipart/x-mixed-replace") { + if (info.headers.get() && info.mime_type == "multipart/x-mixed-replace") { std::string content_type; info.headers->EnumerateHeader(NULL, "content-type", &content_type); diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index d68988b..ccbb9af 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -90,7 +90,7 @@ PluginHost *PluginHost::Singleton() { } DCHECK(singleton.get() != NULL); - return singleton; + return singleton.get(); } void PluginHost::InitializeHostFuncs() { @@ -344,7 +344,7 @@ NPError NPN_RequestRead(NPStream* stream, NPByteRange* range_list) { scoped_refptr<PluginInstance> plugin( reinterpret_cast<PluginInstance*>(stream->ndata)); - if (!plugin) + if (!plugin.get()) return NPERR_GENERIC_ERROR; plugin->RequestRead(stream, range_list); @@ -361,7 +361,7 @@ static NPError GetURLNotify(NPP id, return NPERR_INVALID_URL; scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { return NPERR_GENERIC_ERROR; } @@ -425,7 +425,7 @@ static NPError PostURLNotify(NPP id, return NPERR_INVALID_URL; scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_GENERIC_ERROR; } @@ -683,7 +683,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { switch (static_cast<int>(variable)) { case NPNVWindowNPObject: { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } @@ -703,7 +703,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { } case NPNVPluginElementNPObject: { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } @@ -724,7 +724,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { #if !defined(OS_MACOSX) // OS X doesn't have windowed plugins. case NPNVnetscapeWindow: { scoped_refptr<PluginInstance> plugin = FindInstance(id); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } @@ -761,7 +761,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { case NPNVprivateModeBool: { NPBool* private_mode = reinterpret_cast<NPBool*>(value); scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } @@ -836,7 +836,7 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) { // Allows the plugin to set various modes scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } @@ -920,13 +920,13 @@ void* NPN_GetJavaPeer(NPP) { void NPN_PushPopupsEnabledState(NPP id, NPBool enabled) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) + if (plugin.get()) plugin->PushPopupsEnabledState(enabled ? true : false); } void NPN_PopPopupsEnabledState(NPP id) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) + if (plugin.get()) plugin->PopPopupsEnabledState(); } @@ -934,7 +934,7 @@ void NPN_PluginThreadAsyncCall(NPP id, void (*func)(void*), void* user_data) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) + if (plugin.get()) plugin->PluginThreadAsyncCall(func, user_data); } @@ -956,7 +956,7 @@ NPError NPN_GetValueForURL(NPP id, case NPNURLVProxy: { result = "DIRECT"; scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) + if (!plugin.get()) return NPERR_GENERIC_ERROR; WebPlugin* webplugin = plugin->webplugin(); @@ -969,7 +969,7 @@ NPError NPN_GetValueForURL(NPP id, } case NPNURLVCookie: { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) + if (!plugin.get()) return NPERR_GENERIC_ERROR; WebPlugin* webplugin = plugin->webplugin(); @@ -1009,7 +1009,7 @@ NPError NPN_SetValueForURL(NPP id, switch (variable) { case NPNURLVCookie: { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) + if (!plugin.get()) return NPERR_GENERIC_ERROR; WebPlugin* webplugin = plugin->webplugin(); @@ -1055,7 +1055,7 @@ uint32_t NPN_ScheduleTimer(NPP id, NPBool repeat, void (*func)(NPP id, uint32_t timer_id)) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) + if (!plugin.get()) return 0; return plugin->ScheduleTimer(interval, repeat, func); @@ -1063,7 +1063,7 @@ uint32_t NPN_ScheduleTimer(NPP id, void NPN_UnscheduleTimer(NPP id, uint32_t timer_id) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) + if (plugin.get()) plugin->UnscheduleTimer(timer_id); } @@ -1072,7 +1072,7 @@ NPError NPN_PopUpContextMenu(NPP id, NPMenu* menu) { return NPERR_INVALID_PARAM; scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) { + if (plugin.get()) { return plugin->PopUpContextMenu(menu); } NOTREACHED(); @@ -1084,9 +1084,9 @@ NPBool NPN_ConvertPoint(NPP id, double sourceX, double sourceY, double *destX, double *destY, NPCoordinateSpace destSpace) { scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (plugin) { - return plugin->ConvertPoint(sourceX, sourceY, sourceSpace, - destX, destY, destSpace); + if (plugin.get()) { + return plugin->ConvertPoint( + sourceX, sourceY, sourceSpace, destX, destY, destSpace); } NOTREACHED(); return false; @@ -1106,7 +1106,7 @@ NPBool NPN_UnfocusInstance(NPP id, NPFocusDirection direction) { void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) { scoped_refptr<PluginInstance> plugin(FindInstance(instance)); - if (plugin) { + if (plugin.get()) { plugin->URLRedirectResponse(!!allow, notify_data); } } diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc index bcda084..e24ff35 100644 --- a/webkit/plugins/npapi/plugin_instance.cc +++ b/webkit/plugins/npapi/plugin_instance.cc @@ -77,7 +77,7 @@ PluginInstance::~PluginInstance() { npp_ = 0; } - if (plugin_) + if (plugin_.get()) plugin_->CloseInstance(); } @@ -107,7 +107,7 @@ void PluginInstance::RemoveStream(PluginStream* stream) { std::vector<scoped_refptr<PluginStream> >::iterator stream_index; for (stream_index = open_streams_.begin(); stream_index != open_streams_.end(); ++stream_index) { - if (*stream_index == stream) { + if (stream_index->get() == stream) { open_streams_.erase(stream_index); break; } @@ -534,7 +534,7 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) { range_info.push_back(','); } - if (plugin_data_stream_) { + if (plugin_data_stream_.get()) { if (plugin_data_stream_->stream() == stream) { webplugin_->CancelDocumentLoad(); plugin_data_stream_ = NULL; @@ -550,7 +550,7 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) { std::vector<scoped_refptr<PluginStream> >::iterator stream_index; for (stream_index = open_streams_.begin(); stream_index != open_streams_.end(); ++stream_index) { - PluginStream* plugin_stream = *stream_index; + PluginStream* plugin_stream = stream_index->get(); if (plugin_stream->stream() == stream) { // A stream becomes seekable the first time NPN_RequestRead // is called on it. @@ -671,7 +671,7 @@ void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) { std::vector<scoped_refptr<PluginStream> >::iterator stream_index; for (stream_index = open_streams_.begin(); stream_index != open_streams_.end(); ++stream_index) { - PluginStream* plugin_stream = *stream_index; + PluginStream* plugin_stream = stream_index->get(); if (plugin_stream->notify_data() == notify_data) { WebPluginResourceClient* resource_client = plugin_stream->AsResourceClient(); diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/plugins/npapi/plugin_instance.h index a4e27b5..84283bb 100644 --- a/webkit/plugins/npapi/plugin_instance.h +++ b/webkit/plugins/npapi/plugin_instance.h @@ -104,7 +104,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> { // Get the mimeType for this plugin stream const std::string &mime_type() { return mime_type_; } - PluginLib* plugin_lib() { return plugin_; } + PluginLib* plugin_lib() { return plugin_.get(); } #if defined(OS_MACOSX) // Get/Set the Mac NPAPI drawing and event models diff --git a/webkit/plugins/npapi/plugin_lib.cc b/webkit/plugins/npapi/plugin_lib.cc index 5f866b8..e6baf48 100644 --- a/webkit/plugins/npapi/plugin_lib.cc +++ b/webkit/plugins/npapi/plugin_lib.cc @@ -31,7 +31,7 @@ PluginLib* PluginLib::CreatePluginLib(const base::FilePath& filename) { for (size_t i = 0; i < g_loaded_libs->size(); ++i) { if ((*g_loaded_libs)[i]->plugin_info().path == filename) - return (*g_loaded_libs)[i]; + return (*g_loaded_libs)[i].get(); } webkit::WebPluginInfo info; diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.cc b/webkit/plugins/npapi/webplugin_delegate_impl.cc index 831de3d..8cdf33a 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl.cc @@ -102,7 +102,7 @@ bool WebPluginDelegateImpl::Initialize( } void WebPluginDelegateImpl::DestroyInstance() { - if (instance_ && (instance_->npp()->ndata != NULL)) { + if (instance_.get() && (instance_->npp()->ndata != NULL)) { // Shutdown all streams before destroying so that // no streams are left "in progress". Need to do // this before calling set_web_plugin(NULL) because the diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc index 3fcac4c..6b9e0c0 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc @@ -176,7 +176,7 @@ bool WebPluginDelegateImpl::WindowedReposition( } void WebPluginDelegateImpl::WindowedSetWindow() { - if (!instance_) + if (!instance_.get()) return; if (!windowed_handle_) { diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.cc b/webkit/plugins/ppapi/content_decryptor_delegate.cc index be4531a..4c711e6 100644 --- a/webkit/plugins/ppapi/content_decryptor_delegate.cc +++ b/webkit/plugins/ppapi/content_decryptor_delegate.cc @@ -54,7 +54,7 @@ bool MakeBufferResource(PP_Instance instance, scoped_refptr<PPB_Buffer_Impl> buffer( PPB_Buffer_Impl::CreateResource(instance, size)); - if (!buffer) + if (!buffer.get()) return false; BufferAutoMapper mapper(buffer.get()); @@ -353,10 +353,9 @@ bool ContentDecryptorDelegate::Decrypt( // now because there is only one pending audio/video decrypt request at any // time. This is enforced by the media pipeline. scoped_refptr<PPB_Buffer_Impl> encrypted_resource; - if (!MakeMediaBufferResource(stream_type, - encrypted_buffer, - &encrypted_resource) || - !encrypted_resource) { + if (!MakeMediaBufferResource( + stream_type, encrypted_buffer, &encrypted_resource) || + !encrypted_resource.get()) { return false; } ScopedPPResource pp_resource(encrypted_resource.get()); @@ -536,7 +535,7 @@ bool ContentDecryptorDelegate::DecryptAndDecodeAudio( } // The resource should not be NULL for non-EOS buffer. - if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource) + if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource.get()) return false; const uint32_t request_id = next_decryption_request_id_++; @@ -580,7 +579,7 @@ bool ContentDecryptorDelegate::DecryptAndDecodeVideo( } // The resource should not be 0 for non-EOS buffer. - if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource) + if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource.get()) return false; const uint32_t request_id = next_decryption_request_id_++; @@ -978,7 +977,7 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( video_input_resource_; const size_t data_size = static_cast<size_t>(encrypted_buffer->GetDataSize()); - if (!media_resource || media_resource->size() < data_size) { + if (!media_resource.get() || media_resource->size() < data_size) { // Either the buffer hasn't been created yet, or we have one that isn't big // enough to fit |size| bytes. @@ -988,8 +987,8 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( // they are usually small (compared to outputs). The over-allocated memory // should be negligible. const uint32_t kMinimumMediaBufferSize = 1024; - uint32_t media_resource_size = media_resource ? media_resource->size() : - kMinimumMediaBufferSize; + uint32_t media_resource_size = + media_resource.get() ? media_resource->size() : kMinimumMediaBufferSize; while (media_resource_size < data_size) media_resource_size *= 2; @@ -999,11 +998,11 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( << " bytes to fit input."; media_resource = PPB_Buffer_Impl::CreateResource(pp_instance_, media_resource_size); - if (!media_resource) + if (!media_resource.get()) return false; } - BufferAutoMapper mapper(media_resource); + BufferAutoMapper mapper(media_resource.get()); if (!mapper.data() || mapper.size() < data_size) { media_resource = NULL; return false; diff --git a/webkit/plugins/ppapi/npapi_glue.cc b/webkit/plugins/ppapi/npapi_glue.cc index ed8d2cc..3dcae6b 100644 --- a/webkit/plugins/ppapi/npapi_glue.cc +++ b/webkit/plugins/ppapi/npapi_glue.cc @@ -67,7 +67,7 @@ bool PPVarToNPVariant(PP_Var var, NPVariant* result) { } case PP_VARTYPE_OBJECT: { scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(var)); - if (!object) { + if (!object.get()) { VOID_TO_NPVARIANT(*result); return false; } @@ -151,7 +151,7 @@ PP_Var NPObjectToPPVar(PluginInstance* instance, NPObject* object) { scoped_refptr<NPObjectVar> object_var( HostGlobals::Get()->host_var_tracker()->NPObjectVarForNPObject( instance->pp_instance(), object)); - if (!object_var) { // No object for this module yet, make a new one. + if (!object_var.get()) { // No object for this module yet, make a new one. object_var = new NPObjectVar(instance->pp_instance(), object); } return object_var->GetPPVar(); diff --git a/webkit/plugins/ppapi/npobject_var.cc b/webkit/plugins/ppapi/npobject_var.cc index 5c89281..0616907 100644 --- a/webkit/plugins/ppapi/npobject_var.cc +++ b/webkit/plugins/ppapi/npobject_var.cc @@ -51,7 +51,7 @@ scoped_refptr<NPObjectVar> NPObjectVar::FromPPVar(PP_Var var) { return scoped_refptr<NPObjectVar>(NULL); scoped_refptr<Var> var_object( PpapiGlobals::Get()->GetVarTracker()->GetVar(var)); - if (!var_object) + if (!var_object.get()) return scoped_refptr<NPObjectVar>(); return scoped_refptr<NPObjectVar>(var_object->AsNPObjectVar()); } diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 5f3e00a..c27720b 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -481,7 +481,7 @@ PluginInstance::~PluginInstance() { delegate_->InstanceDeleted(this); module_->InstanceDeleted(this); // If we switched from the NaCl plugin module, notify it too. - if (original_module_) + if (original_module_.get()) original_module_->InstanceDeleted(this); // This should be last since some of the above "instance deleted" calls will @@ -574,14 +574,14 @@ void PluginInstance::ScrollRect(int dx, int dy, const gfx::Rect& rect) { } unsigned PluginInstance::GetBackingTextureId() { - if (bound_graphics_3d_) + if (bound_graphics_3d_.get()) return bound_graphics_3d_->GetBackingTextureId(); return 0; } void PluginInstance::CommitBackingTexture() { - if (texture_layer_) + if (texture_layer_.get()) texture_layer_->SetNeedsDisplay(); } @@ -995,14 +995,14 @@ void PluginInstance::PageVisibilityChanged(bool is_visible) { void PluginInstance::ViewWillInitiatePaint() { if (GetBoundGraphics2D()) GetBoundGraphics2D()->ViewWillInitiatePaint(); - else if (bound_graphics_3d_) + else if (bound_graphics_3d_.get()) bound_graphics_3d_->ViewWillInitiatePaint(); } void PluginInstance::ViewInitiatedPaint() { if (GetBoundGraphics2D()) GetBoundGraphics2D()->ViewInitiatedPaint(); - else if (bound_graphics_3d_) + else if (bound_graphics_3d_.get()) bound_graphics_3d_->ViewInitiatedPaint(); } @@ -1011,7 +1011,7 @@ void PluginInstance::ViewFlushedPaint() { scoped_refptr<PluginInstance> ref(this); if (GetBoundGraphics2D()) GetBoundGraphics2D()->ViewFlushedPaint(); - else if (bound_graphics_3d_) + else if (bound_graphics_3d_.get()) bound_graphics_3d_->ViewFlushedPaint(); } @@ -1791,7 +1791,7 @@ void PluginInstance::UpdateLayer() { layer_bound_to_fullscreen_ == !!fullscreen_container_) return; - if (texture_layer_) { + if (texture_layer_.get()) { texture_layer_->ClearClient(); if (!layer_bound_to_fullscreen_) container_->setWebLayer(NULL); @@ -1957,7 +1957,7 @@ PP_Bool PluginInstance::BindGraphics(PP_Instance instance, // The Graphics3D instance can't be destroyed until we call // UpdateLayer(). scoped_refptr< ::ppapi::Resource> old_graphics = bound_graphics_3d_.get(); - if (bound_graphics_3d_) { + if (bound_graphics_3d_.get()) { bound_graphics_3d_->BindToInstance(false); bound_graphics_3d_ = NULL; } @@ -2239,7 +2239,7 @@ PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) { NOTIMPLEMENTED(); return NULL; case ::ppapi::GAMEPAD_SINGLETON_ID: - return gamepad_impl_; + return gamepad_impl_.get(); } NOTREACHED(); diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc index 6980043..a1efd35 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc @@ -90,7 +90,7 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) { instance_ = init_data_->module->CreateInstance(init_data_->delegate, container, init_data_->url); - if (!instance_) + if (!instance_.get()) return false; // Enable script objects for this plugin. @@ -123,7 +123,7 @@ void WebPluginImpl::destroy() { if (container_) container_->clearScriptObjects(); - if (instance_) { + if (instance_.get()) { ::ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_); instance_object_ = PP_MakeUndefined(); instance_->Delete(); @@ -140,13 +140,13 @@ NPObject* WebPluginImpl::scriptableObject() { instance_object_ = instance_->GetInstanceObject(); // GetInstanceObject talked to the plugin which may have removed the instance // from the DOM, in which case instance_ would be NULL now. - if (!instance_) + if (!instance_.get()) return NULL; scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(instance_object_)); // If there's an InstanceObject, tell the Instance's MessageChannel to pass // any non-postMessage calls to it. - if (object) { + if (object.get()) { instance_->message_channel().SetPassthroughObject(object->np_object()); } NPObject* message_channel_np_object(instance_->message_channel().np_object()); diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.cc b/webkit/plugins/ppapi/ppb_buffer_impl.cc index ffc7932..c00a9db 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.cc +++ b/webkit/plugins/ppapi/ppb_buffer_impl.cc @@ -32,7 +32,7 @@ PPB_Buffer_Impl::~PPB_Buffer_Impl() { // static PP_Resource PPB_Buffer_Impl::Create(PP_Instance instance, uint32_t size) { scoped_refptr<PPB_Buffer_Impl> new_resource(CreateResource(instance, size)); - if (new_resource) + if (new_resource.get()) return new_resource->GetReference(); return 0; } diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index fd814f2..2bd1eab 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -123,7 +123,7 @@ void GetFileInfoCallback( base::PlatformFileError error_code, const base::PlatformFileInfo& file_info) { base::FileUtilProxy::Close( - task_runner, file, base::Bind(&IgnoreCloseCallback)); + task_runner.get(), file, base::Bind(&IgnoreCloseCallback)); if (!TrackedCallback::IsPending(callback)) return; @@ -156,11 +156,12 @@ void QueryCallback(scoped_refptr<base::TaskRunner> task_runner, base::PlatformFile file = passed_file.ReleaseValue(); if (!base::FileUtilProxy::GetFileInfoFromPlatformFile( - task_runner, file, - base::Bind(&GetFileInfoCallback, task_runner, file, info, - callback))) { + task_runner.get(), + file, + base::Bind( + &GetFileInfoCallback, task_runner, file, info, callback))) { base::FileUtilProxy::Close( - task_runner, file, base::Bind(&IgnoreCloseCallback)); + task_runner.get(), file, base::Bind(&IgnoreCloseCallback)); callback->Run(PP_ERROR_FAILED); } } @@ -313,7 +314,7 @@ PP_Resource PPB_FileRef_Impl::GetParent() { scoped_refptr<PPB_FileRef_Impl> parent_ref( CreateInternal(pp_instance(), file_system_, parent_path)); - if (!parent_ref) + if (!parent_ref.get()) return 0; return parent_ref->GetReference(); } @@ -393,9 +394,9 @@ int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref, PP_Var PPB_FileRef_Impl::GetAbsolutePath() { if (GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) return GetPath(); - if (!external_path_var_) { - external_path_var_ = new StringVar( - external_file_system_path_.AsUTF8Unsafe()); + if (!external_path_var_.get()) { + external_path_var_ = + new StringVar(external_file_system_path_.AsUTF8Unsafe()); } return external_path_var_->GetPPVar(); } @@ -461,7 +462,7 @@ int32_t PPB_FileRef_Impl::QueryInHost( scoped_refptr<TrackedCallback> callback) { scoped_refptr<PluginInstance> plugin_instance = ResourceHelper::GetPluginInstance(this); - if (!plugin_instance) + if (!plugin_instance.get()) return PP_ERROR_FAILED; if (!file_system_) { diff --git a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc index 4ea102a8..63c024e 100644 --- a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc +++ b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc @@ -81,7 +81,7 @@ bool PPVarToNPVariantNoCopy(PP_Var var, NPVariant* result) { } case PP_VARTYPE_OBJECT: { scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(var)); - if (!object) { + if (!object.get()) { VOID_TO_NPVARIANT(*result); return false; } @@ -112,7 +112,7 @@ class ObjectAccessorTryCatch : public TryCatch { ObjectAccessorTryCatch(PP_Var object, PP_Var* exception) : TryCatch(exception), object_(NPObjectVar::FromPPVar(object)) { - if (!object_) { + if (!object_.get()) { SetException(kInvalidObjectException); } } @@ -379,7 +379,7 @@ bool IsInstanceOfDeprecated(PP_Var var, const PPP_Class_Deprecated* ppp_class, void** ppp_class_data) { scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(var)); - if (!object) + if (!object.get()) return false; // Not an object at all. return PluginObject::IsInstanceOf(object->np_object(), diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc index 095c9df..8706a3c 100644 --- a/webkit/plugins/ppapi/url_request_info_util.cc +++ b/webkit/plugins/ppapi/url_request_info_util.cc @@ -106,7 +106,7 @@ bool EnsureFileRefObjectsPopulated(::ppapi::URLRequestInfoData* data) { // is the state of the request as it comes off IPC). for (size_t i = 0; i < data->body.size(); ++i) { URLRequestInfoData::BodyItem& item = data->body[i]; - if (item.is_file && !item.file_ref) { + if (item.is_file && !item.file_ref.get()) { EnterResourceNoLock<PPB_FileRef_API> enter( item.file_ref_host_resource.host_resource(), false); if (!enter.succeeded()) @@ -157,7 +157,7 @@ bool CreateWebURLRequest(::ppapi::URLRequestInfoData* data, for (size_t i = 0; i < data->body.size(); ++i) { const URLRequestInfoData::BodyItem& item = data->body[i]; if (item.is_file) { - if (!AppendFileRefToBody(item.file_ref, + if (!AppendFileRefToBody(item.file_ref.get(), item.start_offset, item.number_of_bytes, item.expected_last_modified_time, diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc index bd251b5..ddac35c 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc @@ -213,7 +213,7 @@ bool WebLayerImpl::hasActiveAnimation() { return layer_->HasActiveAnimation(); } void WebLayerImpl::transferAnimationsTo(WebLayer* other) { DCHECK(other); - layer_->TransferAnimationsTo(static_cast<WebLayerImpl*>(other)->layer_); + layer_->TransferAnimationsTo(static_cast<WebLayerImpl*>(other)->layer_.get()); } void WebLayerImpl::setForceRenderSurface(bool force_render_surface) { diff --git a/webkit/renderer/media/buffered_data_source.cc b/webkit/renderer/media/buffered_data_source.cc index cb443e1..2fc1528 100644 --- a/webkit/renderer/media/buffered_data_source.cc +++ b/webkit/renderer/media/buffered_data_source.cc @@ -122,7 +122,7 @@ BufferedResourceLoader* BufferedDataSource::CreateResourceLoader( strategy, bitrate_, playback_rate_, - media_log_); + media_log_.get()); } void BufferedDataSource::set_host(media::DataSourceHost* host) { diff --git a/webkit/renderer/media/crypto/ppapi_decryptor.cc b/webkit/renderer/media/crypto/ppapi_decryptor.cc index 93440f3..ab79b76 100644 --- a/webkit/renderer/media/crypto/ppapi_decryptor.cc +++ b/webkit/renderer/media/crypto/ppapi_decryptor.cc @@ -38,7 +38,7 @@ PpapiDecryptor::PpapiDecryptor( render_loop_proxy_(base::MessageLoopProxy::current()), weak_ptr_factory_(this), weak_this_(weak_ptr_factory_.GetWeakPtr()) { - DCHECK(plugin_instance_); + DCHECK(plugin_instance_.get()); } PpapiDecryptor::~PpapiDecryptor() { diff --git a/webkit/renderer/media/crypto/proxy_decryptor.cc b/webkit/renderer/media/crypto/proxy_decryptor.cc index 87a75ab..94c32a8 100644 --- a/webkit/renderer/media/crypto/proxy_decryptor.cc +++ b/webkit/renderer/media/crypto/proxy_decryptor.cc @@ -169,7 +169,7 @@ scoped_ptr<media::Decryptor> ProxyDecryptor::CreatePpapiDecryptor( DCHECK(!plugin_type.empty()); const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance = CreateHelperPlugin(plugin_type, web_media_player_client_, web_frame_); - did_create_helper_plugin_ = plugin_instance != NULL; + did_create_helper_plugin_ = plugin_instance.get() != NULL; if (!did_create_helper_plugin_) { DVLOG(1) << "ProxyDecryptor: plugin instance creation failed."; return scoped_ptr<media::Decryptor>(); diff --git a/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc index 1ad5d51..5d84960 100644 --- a/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc +++ b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc @@ -33,34 +33,34 @@ class WebAudioSourceProviderImplTest void CallAllSinkMethodsAndVerify(bool verify) { testing::InSequence s; - EXPECT_CALL(*mock_sink_, Start()).Times(verify); + EXPECT_CALL(*mock_sink_.get(), Start()).Times(verify); wasp_impl_->Start(); - EXPECT_CALL(*mock_sink_, Play()).Times(verify); + EXPECT_CALL(*mock_sink_.get(), Play()).Times(verify); wasp_impl_->Play(); - EXPECT_CALL(*mock_sink_, Pause()).Times(verify); + EXPECT_CALL(*mock_sink_.get(), Pause()).Times(verify); wasp_impl_->Pause(); - EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume)).Times(verify); + EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume)).Times(verify); wasp_impl_->SetVolume(kTestVolume); - EXPECT_CALL(*mock_sink_, Stop()).Times(verify); + EXPECT_CALL(*mock_sink_.get(), Stop()).Times(verify); wasp_impl_->Stop(); - testing::Mock::VerifyAndClear(mock_sink_); + testing::Mock::VerifyAndClear(mock_sink_.get()); } void SetClient(WebKit::WebAudioSourceProviderClient* client) { testing::InSequence s; if (client) { - EXPECT_CALL(*mock_sink_, Stop()); + EXPECT_CALL(*mock_sink_.get(), Stop()); EXPECT_CALL(*this, setFormat(params_.channels(), params_.sample_rate())); } wasp_impl_->setClient(client); - testing::Mock::VerifyAndClear(mock_sink_); + testing::Mock::VerifyAndClear(mock_sink_.get()); testing::Mock::VerifyAndClear(this); } @@ -92,7 +92,7 @@ TEST_F(WebAudioSourceProviderImplTest, SetClientBeforeInitialize) { // setClient() with a NULL client should do nothing if no client is set. wasp_impl_->setClient(NULL); - EXPECT_CALL(*mock_sink_, Stop()); + EXPECT_CALL(*mock_sink_.get(), Stop()); wasp_impl_->setClient(this); // When Initialize() is called after setClient(), the params should propagate @@ -118,7 +118,7 @@ TEST_F(WebAudioSourceProviderImplTest, SinkMethods) { CallAllSinkMethodsAndVerify(false); // Removing the client should cause WASP to revert to the underlying sink. - EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume)); + EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume)); SetClient(NULL); CallAllSinkMethodsAndVerify(true); } @@ -128,12 +128,12 @@ TEST_F(WebAudioSourceProviderImplTest, SinkStateRestored) { wasp_impl_->Initialize(params_, &fake_callback_); // Verify state set before the client is set propagates back afterward. - EXPECT_CALL(*mock_sink_, Start()); + EXPECT_CALL(*mock_sink_.get(), Start()); wasp_impl_->Start(); SetClient(this); - EXPECT_CALL(*mock_sink_, SetVolume(1.0)); - EXPECT_CALL(*mock_sink_, Start()); + EXPECT_CALL(*mock_sink_.get(), SetVolume(1.0)); + EXPECT_CALL(*mock_sink_.get(), Start()); SetClient(NULL); // Verify state set while the client was attached propagates back afterward. @@ -141,9 +141,9 @@ TEST_F(WebAudioSourceProviderImplTest, SinkStateRestored) { wasp_impl_->Play(); wasp_impl_->SetVolume(kTestVolume); - EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume)); - EXPECT_CALL(*mock_sink_, Start()); - EXPECT_CALL(*mock_sink_, Play()); + EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume)); + EXPECT_CALL(*mock_sink_.get(), Start()); + EXPECT_CALL(*mock_sink_.get(), Play()); SetClient(NULL); } diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc index fd43f3d..ac99cad 100644 --- a/webkit/renderer/media/webmediaplayer_impl.cc +++ b/webkit/renderer/media/webmediaplayer_impl.cc @@ -154,8 +154,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); CHECK(media_thread_.Start()); - pipeline_.reset(new media::Pipeline( - media_thread_.message_loop_proxy(), media_log_)); + pipeline_.reset(new media::Pipeline(media_thread_.message_loop_proxy(), + media_log_.get())); // Let V8 know we started new thread if we did not do it yet. // Made separate task to avoid deletion of player currently being created. @@ -183,8 +183,9 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( // Use the null sink if no sink was provided. audio_source_provider_ = new WebAudioSourceProviderImpl( - params.audio_renderer_sink() ? params.audio_renderer_sink() : - new media::NullAudioSink(media_thread_.message_loop_proxy())); + params.audio_renderer_sink().get() + ? params.audio_renderer_sink() + : new media::NullAudioSink(media_thread_.message_loop_proxy())); } WebMediaPlayerImpl::~WebMediaPlayerImpl() { @@ -248,8 +249,10 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) { // Otherwise it's a regular request which requires resolving the URL first. GURL gurl(url); data_source_.reset(new BufferedDataSource( - main_loop_, frame_, media_log_, base::Bind( - &WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr()))); + main_loop_, + frame_, + media_log_.get(), + base::Bind(&WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr()))); data_source_->Initialize( url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), base::Bind( @@ -542,7 +545,7 @@ void WebMediaPlayerImpl::paint(WebCanvas* canvas, video_frame = current_frame_; } gfx::Rect gfx_rect(rect); - skcanvas_video_renderer_.Paint(video_frame, canvas, gfx_rect, alpha); + skcanvas_video_renderer_.Paint(video_frame.get(), canvas, gfx_rect, alpha); } bool WebMediaPlayerImpl::hasSingleSecurityOrigin() const { @@ -634,7 +637,7 @@ bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture( base::AutoLock auto_lock(lock_); video_frame = current_frame_; } - if (video_frame && + if (video_frame.get() && video_frame->format() == media::VideoFrame::NATIVE_TEXTURE && video_frame->texture_target() == GL_TEXTURE_2D) { uint32 source_texture = video_frame->texture_id(); @@ -1097,7 +1100,7 @@ void WebMediaPlayerImpl::StartPipeline(WebKit::WebMediaSource* media_source) { scoped_ptr<media::AudioRenderer> audio_renderer( new media::AudioRendererImpl(media_thread_.message_loop_proxy(), - audio_source_provider_, + audio_source_provider_.get(), audio_decoders.Pass(), set_decryptor_ready_cb)); filter_collection->SetAudioRenderer(audio_renderer.Pass()); @@ -1105,7 +1108,7 @@ void WebMediaPlayerImpl::StartPipeline(WebKit::WebMediaSource* media_source) { // Create our video decoders and renderer. ScopedVector<media::VideoDecoder> video_decoders; - if (gpu_factories_) { + if (gpu_factories_.get()) { video_decoders.push_back(new media::GpuVideoDecoder( media_thread_.message_loop_proxy(), gpu_factories_)); } @@ -1177,7 +1180,7 @@ void WebMediaPlayerImpl::Destroy() { chunk_demuxer_ = NULL; } - if (gpu_factories_) { + if (gpu_factories_.get()) { gpu_factories_->Abort(); gpu_factories_ = NULL; } @@ -1210,7 +1213,7 @@ WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { } WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { - return audio_source_provider_; + return audio_source_provider_.get(); } void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { @@ -1241,7 +1244,7 @@ void WebMediaPlayerImpl::FrameReady( const scoped_refptr<media::VideoFrame>& frame) { base::AutoLock auto_lock(lock_); - if (current_frame_ && + if (current_frame_.get() && current_frame_->natural_size() != frame->natural_size() && !pending_size_change_) { pending_size_change_ = true; diff --git a/webkit/renderer/media/webmediaplayer_ms.cc b/webkit/renderer/media/webmediaplayer_ms.cc index 81200f6..69bef87 100644 --- a/webkit/renderer/media/webmediaplayer_ms.cc +++ b/webkit/renderer/media/webmediaplayer_ms.cc @@ -68,11 +68,11 @@ WebMediaPlayerMS::~WebMediaPlayerMS() { SetVideoFrameProviderClient(NULL); GetClient()->setWebLayer(NULL); - if (video_frame_provider_) { + if (video_frame_provider_.get()) { video_frame_provider_->Stop(); } - if (audio_renderer_) { + if (audio_renderer_.get()) { if (audio_renderer_->IsLocalRenderer()) { audio_renderer_->Stop(); } else if (!paused_) { @@ -110,16 +110,16 @@ void WebMediaPlayerMS::load(const WebKit::WebURL& url, CORSMode cors_mode) { audio_renderer_ = media_stream_client_->GetAudioRenderer(url); - if (video_frame_provider_ || audio_renderer_) { + if (video_frame_provider_.get() || audio_renderer_.get()) { GetClient()->setOpaque(true); - if (audio_renderer_) + if (audio_renderer_.get()) audio_renderer_->Start(); - if (video_frame_provider_) { + if (video_frame_provider_.get()) { video_frame_provider_->Start(); } else { // This is audio-only mode. - DCHECK(audio_renderer_); + DCHECK(audio_renderer_.get()); SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); } @@ -143,10 +143,10 @@ void WebMediaPlayerMS::play() { DCHECK(thread_checker_.CalledOnValidThread()); if (paused_) { - if (video_frame_provider_) + if (video_frame_provider_.get()) video_frame_provider_->Play(); - if (audio_renderer_) + if (audio_renderer_.get()) audio_renderer_->Play(); if (delegate_) @@ -162,11 +162,11 @@ void WebMediaPlayerMS::pause() { DVLOG(1) << "WebMediaPlayerMS::pause"; DCHECK(thread_checker_.CalledOnValidThread()); - if (video_frame_provider_) + if (video_frame_provider_.get()) video_frame_provider_->Pause(); if (!paused_) { - if (audio_renderer_) + if (audio_renderer_.get()) audio_renderer_->Pause(); if (delegate_) @@ -198,7 +198,7 @@ void WebMediaPlayerMS::setRate(double rate) { void WebMediaPlayerMS::setVolume(double volume) { DCHECK(thread_checker_.CalledOnValidThread()); - if (!audio_renderer_) + if (!audio_renderer_.get()) return; DVLOG(1) << "WebMediaPlayerMS::setVolume(volume=" << volume << ")"; audio_renderer_->SetVolume(volume); @@ -219,19 +219,19 @@ bool WebMediaPlayerMS::totalBytesKnown() { bool WebMediaPlayerMS::hasVideo() const { DCHECK(thread_checker_.CalledOnValidThread()); - return (video_frame_provider_ != NULL); + return (video_frame_provider_.get() != NULL); } bool WebMediaPlayerMS::hasAudio() const { DCHECK(thread_checker_.CalledOnValidThread()); - return (audio_renderer_ != NULL); + return (audio_renderer_.get() != NULL); } WebKit::WebSize WebMediaPlayerMS::naturalSize() const { DCHECK(thread_checker_.CalledOnValidThread()); gfx::Size size; - if (current_frame_) + if (current_frame_.get()) size = current_frame_->natural_size(); DVLOG(3) << "WebMediaPlayerMS::naturalSize, " << size.ToString(); return WebKit::WebSize(size); @@ -254,9 +254,9 @@ double WebMediaPlayerMS::duration() const { double WebMediaPlayerMS::currentTime() const { DCHECK(thread_checker_.CalledOnValidThread()); - if (current_frame_) { + if (current_frame_.get()) { return current_frame_->GetTimestamp().InSecondsF(); - } else if (audio_renderer_) { + } else if (audio_renderer_.get()) { return audio_renderer_->GetCurrentRenderTime().InSecondsF(); } return 0.0; @@ -311,11 +311,11 @@ void WebMediaPlayerMS::paint(WebCanvas* canvas, DCHECK(thread_checker_.CalledOnValidThread()); gfx::RectF dest_rect(rect.x, rect.y, rect.width, rect.height); - video_renderer_.Paint(current_frame_, canvas, dest_rect, alpha); + video_renderer_.Paint(current_frame_.get(), canvas, dest_rect, alpha); { base::AutoLock auto_lock(current_frame_lock_); - if (current_frame_) + if (current_frame_.get()) current_frame_used_ = true; } } @@ -376,7 +376,7 @@ scoped_refptr<media::VideoFrame> WebMediaPlayerMS::GetCurrentFrame() { DVLOG(3) << "WebMediaPlayerMS::GetCurrentFrame"; base::AutoLock auto_lock(current_frame_lock_); DCHECK(!pending_repaint_); - if (!current_frame_) + if (!current_frame_.get()) return NULL; pending_repaint_ = true; current_frame_used_ = true; @@ -407,7 +407,7 @@ void WebMediaPlayerMS::OnFrameAvailable( SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); GetClient()->sizeChanged(); - if (video_frame_provider_ && GetClient()->needsWebLayerForVideo()) { + if (video_frame_provider_.get() && GetClient()->needsWebLayerForVideo()) { video_weblayer_.reset( new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); GetClient()->setWebLayer(video_weblayer_.get()); @@ -422,12 +422,12 @@ void WebMediaPlayerMS::OnFrameAvailable( sequence_started_ = true; start_time_ = frame->GetTimestamp(); } - bool size_changed = !current_frame_ || - current_frame_->natural_size() != frame->natural_size(); + bool size_changed = !current_frame_.get() || + current_frame_->natural_size() != frame->natural_size(); { base::AutoLock auto_lock(current_frame_lock_); - if (!current_frame_used_ && current_frame_) + if (!current_frame_used_ && current_frame_.get()) ++dropped_frame_count_; current_frame_ = frame; current_frame_->SetTimestamp(frame->GetTimestamp() - start_time_); diff --git a/webkit/renderer/media/webmediaplayer_params.cc b/webkit/renderer/media/webmediaplayer_params.cc index d33c12b..7c6335a 100644 --- a/webkit/renderer/media/webmediaplayer_params.cc +++ b/webkit/renderer/media/webmediaplayer_params.cc @@ -16,7 +16,7 @@ WebMediaPlayerParams::WebMediaPlayerParams( : audio_renderer_sink_(audio_renderer_sink), gpu_factories_(gpu_factories), media_log_(media_log) { - DCHECK(media_log_); + DCHECK(media_log_.get()); } WebMediaPlayerParams::~WebMediaPlayerParams() {} diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index 4c2deca..28cee799 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -356,7 +356,7 @@ WebKit::WebGraphicsContext3DProvider* TestWebKitPlatformSupport:: main_thread_contexts_ = webkit::gpu::TestContextProviderFactory::GetInstance()-> OffscreenContextProviderForMainThread(); - if (!main_thread_contexts_) + if (!main_thread_contexts_.get()) return NULL; return new webkit::gpu::WebGraphicsContext3DProviderImpl( main_thread_contexts_); diff --git a/webkit/support/test_webmessageportchannel.cc b/webkit/support/test_webmessageportchannel.cc index 9d882c16..f302f30 100644 --- a/webkit/support/test_webmessageportchannel.cc +++ b/webkit/support/test_webmessageportchannel.cc @@ -59,7 +59,7 @@ void TestWebMessagePortChannel::entangle(WebMessagePortChannel* remote) { void TestWebMessagePortChannel::postMessage(const WebString& data, WebMessagePortChannelArray* ports) { - if (remote_ == NULL) + if (remote_.get() == NULL) return; base::MessageLoop::current()->PostTask( FROM_HERE, diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc index 3599bec..ddad066 100644 --- a/webkit/tools/test_shell/simple_dom_storage_system.cc +++ b/webkit/tools/test_shell/simple_dom_storage_system.cc @@ -194,9 +194,11 @@ SimpleDomStorageSystem* SimpleDomStorageSystem::g_instance_; SimpleDomStorageSystem::SimpleDomStorageSystem() : weak_factory_(this), - context_(new DomStorageContext(base::FilePath(), base::FilePath(), - NULL, NULL)), - host_(new DomStorageHost(context_)), + context_(new DomStorageContext(base::FilePath(), + base::FilePath(), + NULL, + NULL)), + host_(new DomStorageHost(context_.get())), area_being_processed_(NULL), next_connection_id_(1) { DCHECK(!g_instance_); diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc index 94310dc..7fe4ff5 100644 --- a/webkit/tools/test_shell/simple_file_system.cc +++ b/webkit/tools/test_shell/simple_file_system.cc @@ -93,7 +93,7 @@ void SimpleFileSystem::OpenFileSystem( WebKit::WebFileSystemType type, long long, bool create, WebFileSystemCallbacks* callbacks) { - if (!frame || !file_system_context_) { + if (!frame || !file_system_context_.get()) { // The FileSystem temp directory was not initialized successfully. callbacks->didFail(WebKit::WebFileErrorSecurity); return; @@ -112,7 +112,7 @@ void SimpleFileSystem::DeleteFileSystem( WebFrame* frame, WebKit::WebFileSystemType type, WebFileSystemCallbacks* callbacks) { - if (!frame || !file_system_context_) { + if (!frame || !file_system_context_.get()) { callbacks->didFail(WebKit::WebFileErrorSecurity); return; } diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 0e37a94..127c858 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -461,13 +461,13 @@ class RequestProxy headers.AddHeadersFromString(params->headers); request_->SetExtraRequestHeaders(headers); request_->set_load_flags(params->load_flags); - if (params->request_body) { + if (params->request_body.get()) { request_->set_upload(make_scoped_ptr( params->request_body->ResolveElementsAndCreateUploadDataStream( - static_cast<TestShellRequestContext*>(g_request_context)-> - blob_storage_controller(), - static_cast<TestShellRequestContext*>(g_request_context)-> - file_system_context(), + static_cast<TestShellRequestContext*>(g_request_context) + ->blob_storage_controller(), + static_cast<TestShellRequestContext*>(g_request_context) + ->file_system_context(), base::MessageLoopProxy::current()))); } SimpleAppCacheSystem::SetExtraRequestInfo( @@ -525,7 +525,7 @@ class RequestProxy if (request_->status().is_success()) { int bytes_read; - if (request_->Read(buf_, kDataSize, &bytes_read) && bytes_read) { + if (request_->Read(buf_.get(), kDataSize, &bytes_read) && bytes_read) { OnReceivedData(bytes_read); } else if (!request_->status().is_io_pending()) { Done(); @@ -694,7 +694,7 @@ class RequestProxy request->GetMimeType(&info->mime_type); request->GetCharset(&info->charset); info->content_length = request->GetExpectedContentSize(); - if (downloaded_file_) + if (downloaded_file_.get()) info->download_file_path = downloaded_file_->path(); SimpleAppCacheSystem::GetExtraResponseInfo( request, @@ -763,7 +763,7 @@ class RequestProxy } info->mime_type.clear(); - DCHECK(info->headers); + DCHECK(info->headers.get()); int status_code = info->headers->response_code(); // File protocol does not support response headers. info->headers = NULL; @@ -925,7 +925,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge { virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE { DCHECK(params_.get()); - DCHECK(!params_->request_body); + DCHECK(!params_->request_body.get()); params_->request_body = request_body; } diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc index 50723f0..23253cc 100644 --- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc +++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc @@ -178,7 +178,7 @@ void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) { void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) { DCHECK(base::MessageLoop::current() == g_io_thread); scoped_ptr<std::vector<char> > scoped_data(data); - if (!socket_) + if (!socket_.get()) return; if (!socket_->SendData(&(data->at(0)), data->size())) socket_->Close(); @@ -186,7 +186,7 @@ void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) { void WebSocketStreamHandleBridgeImpl::DoClose() { DCHECK(base::MessageLoop::current() == g_io_thread); - if (!socket_) + if (!socket_.get()) return; socket_->Close(); } @@ -220,7 +220,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() { base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1); // Don't handle OnClose if there are pending tasks. DCHECK_EQ(num_pending_tasks_, 0); - DCHECK(!socket_); + DCHECK(!socket_.get()); DCHECK_EQ(socket_id_, kNoSocketId); webkit_glue::WebSocketStreamHandleDelegate* delegate = delegate_; delegate_ = NULL; diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index bc36f69..6675e3f 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -127,7 +127,7 @@ void TestShellRequestContext::Init( "blob", new webkit_blob::BlobProtocolHandler( blob_storage_controller_.get(), - file_system_context_, + file_system_context_.get(), SimpleResourceLoaderBridge::GetIoThread())); job_factory->SetProtocolHandler( "filesystem", |