Add RetainedRef uses where needed.

storage/browser/database/database_quota_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "storage/browser/database/database_quota_client.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 115 matching lines @@
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
   if (type != storage::kStorageTypeTemporary) {
     callback.Run(0);
     return;
   }
 
   base::PostTaskAndReplyWithResult(
-      db_tracker_thread_.get(),
-      FROM_HERE,
-      base::Bind(&GetOriginUsageOnDBThread, db_tracker_, origin_url),
+      db_tracker_thread_.get(), FROM_HERE,
+      base::Bind(&GetOriginUsageOnDBThread, base::RetainedRef(db_tracker_),
+                 origin_url),
       callback);
 }
 
 void DatabaseQuotaClient::GetOriginsForType(
     storage::StorageType type,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
   if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   std::set<GURL>* origins_ptr = new std::set<GURL>();
   db_tracker_thread_->PostTaskAndReply(
       FROM_HERE,
-      base::Bind(&GetOriginsOnDBThread,
-                 db_tracker_,
+      base::Bind(&GetOriginsOnDBThread, base::RetainedRef(db_tracker_),
                  base::Unretained(origins_ptr)),
-      base::Bind(&DidGetOrigins,
-                 callback,
-                 base::Owned(origins_ptr)));
+      base::Bind(&DidGetOrigins, callback, base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::GetOriginsForHost(
     storage::StorageType type,
     const std::string& host,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
   if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   std::set<GURL>* origins_ptr = new std::set<GURL>();
   db_tracker_thread_->PostTaskAndReply(
       FROM_HERE,
-      base::Bind(&GetOriginsForHostOnDBThread,
-                 db_tracker_,
-                 base::Unretained(origins_ptr),
-                 host),
-      base::Bind(&DidGetOrigins,
-                 callback,
-                 base::Owned(origins_ptr)));
+      base::Bind(&GetOriginsForHostOnDBThread, base::RetainedRef(db_tracker_),
+                 base::Unretained(origins_ptr), host),
+      base::Bind(&DidGetOrigins, callback, base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::DeleteOriginData(const GURL& origin,
                                            storage::StorageType type,
                                            const DeletionCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now, so nothing to delete.
   if (type != storage::kStorageTypeTemporary) {
     callback.Run(storage::kQuotaStatusOk);
     return;
   }
 
-  base::Callback<void(int)> delete_callback =
-      base::Bind(&DidDeleteOriginData,
-                 base::ThreadTaskRunnerHandle::Get(),
-                 callback);
+  base::Callback<void(int)> delete_callback = base::Bind(
+      &DidDeleteOriginData,
+      base::RetainedRef(base::ThreadTaskRunnerHandle::Get()), callback);
 
   PostTaskAndReplyWithResult(
       db_tracker_thread_.get(),
       FROM_HERE,
       base::Bind(&DatabaseTracker::DeleteDataForOrigin,
                  db_tracker_,
                  storage::GetIdentifierFromOrigin(origin),
                  delete_callback),
       delete_callback);
 }
 
 bool DatabaseQuotaClient::DoesSupport(storage::StorageType type) const {
   return type == storage::kStorageTypeTemporary;
 }
 
 }  // namespace storage