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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 80214972a94f856acfc571431cb9c6abcbe6ff26..a4e1b8f165f4f943ea34d114c4ba73ba117e5153 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -745,8 +745,8 @@ void BrowsingDataRemover::ClearCacheOnIOThread() {
// This function should be called on the IO thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK_EQ(STATE_NONE, next_cache_state_);
- DCHECK(main_context_getter_);
- DCHECK(media_context_getter_);
+ DCHECK(main_context_getter_.get());
+ DCHECK(media_context_getter_.get());
next_cache_state_ = STATE_CREATE_MAIN;
DoClearCache(net::OK);
@@ -764,8 +764,9 @@ void BrowsingDataRemover::DoClearCache(int rv) {
case STATE_CREATE_MEDIA: {
// Get a pointer to the cache.
net::URLRequestContextGetter* getter =
- (next_cache_state_ == STATE_CREATE_MAIN) ?
- main_context_getter_ : media_context_getter_;
+ (next_cache_state_ == STATE_CREATE_MAIN)
+ ? main_context_getter_.get()
+ : media_context_getter_.get();
net::HttpTransactionFactory* factory =
getter->GetURLRequestContext()->http_transaction_factory();
@@ -877,9 +878,8 @@ void BrowsingDataRemover::OnGotLocalStorageUsageInfo(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
for (size_t i = 0; i < infos.size(); ++i) {
- if (!BrowsingDataHelper::DoesOriginMatchMask(infos[i].origin,
- origin_set_mask_,
- special_storage_policy_))
+ if (!BrowsingDataHelper::DoesOriginMatchMask(
+ infos[i].origin, origin_set_mask_, special_storage_policy_.get()))
continue;
if (infos[i].last_modified >= delete_begin_ &&
@@ -906,9 +906,8 @@ void BrowsingDataRemover::OnGotSessionStorageUsageInfo(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
for (size_t i = 0; i < infos.size(); ++i) {
- if (!BrowsingDataHelper::DoesOriginMatchMask(infos[i].origin,
- origin_set_mask_,
- special_storage_policy_))
+ if (!BrowsingDataHelper::DoesOriginMatchMask(
+ infos[i].origin, origin_set_mask_, special_storage_policy_.get()))
continue;
dom_storage_context_->DeleteSessionStorage(infos[i]);
@@ -968,7 +967,7 @@ void BrowsingDataRemover::OnGotQuotaManagedOrigins(
if (!BrowsingDataHelper::DoesOriginMatchMask(origin->GetOrigin(),
origin_set_mask_,
- special_storage_policy_))
+ special_storage_policy_.get()))
continue;
++quota_managed_origins_to_delete_count_;

Powered by Google App Engine
This is Rietveld 408576698