Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/16155009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203636 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 40 insertions, 29 deletions

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.