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

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

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 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/local_data_container.cc
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index 593aa5ef0637283fb8e7cbcf599b763edcc80cc2..c01b0b421d227e1c033d93ac8fc75915f0cbbf0c 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -54,19 +54,19 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
base::Bind(&LocalDataContainer::OnCookiesModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
- if (database_helper_) {
+ if (database_helper_.get()) {
database_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnDatabaseModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (local_storage_helper_) {
+ if (local_storage_helper_.get()) {
local_storage_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnLocalStorageModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (session_storage_helper_) {
+ if (session_storage_helper_.get()) {
session_storage_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnSessionStorageModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
@@ -74,37 +74,37 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
// TODO(michaeln): When all of the UI implementations have been updated, make
// this a required parameter.
- if (appcache_helper_) {
+ if (appcache_helper_.get()) {
appcache_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnAppCacheModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (indexed_db_helper_) {
+ if (indexed_db_helper_.get()) {
indexed_db_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnIndexedDBModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (file_system_helper_) {
+ if (file_system_helper_.get()) {
file_system_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnFileSystemModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (quota_helper_) {
+ if (quota_helper_.get()) {
quota_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnQuotaModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (server_bound_cert_helper_) {
+ if (server_bound_cert_helper_.get()) {
server_bound_cert_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnServerBoundCertModelInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
- if (flash_lso_helper_) {
+ if (flash_lso_helper_.get()) {
flash_lso_helper_->StartFetching(
base::Bind(&LocalDataContainer::OnFlashLSOInfoLoaded,
weak_ptr_factory_.GetWeakPtr()));
@@ -119,7 +119,7 @@ void LocalDataContainer::OnAppCacheModelInfoLoaded() {
scoped_refptr<AppCacheInfoCollection> appcache_info =
appcache_helper_->info_collection();
- if (!appcache_info || appcache_info->infos_by_origin.empty())
+ if (!appcache_info.get() || appcache_info->infos_by_origin.empty())
return;
for (InfoByOrigin::const_iterator origin =

Powered by Google App Engine
This is Rietveld 408576698