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

Unified Diff: webkit/browser/database/database_tracker.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/browser/database/database_tracker.cc
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index 0866febc20c5800d1719db20a9f54e731857ae6e..25675399a17e5d37697aad70027cc9f0505bf53c 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),
« no previous file with comments | « webkit/browser/database/database_quota_client.cc ('k') | webkit/browser/database/database_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698