Index: webkit/quota/quota_manager.h |
diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h |
index b86cbfde7b305782d852af4cfef596a3920de1cc..1566177e6c6546f1fdeafd266d2861065607d53f 100644 |
--- a/webkit/quota/quota_manager.h |
+++ b/webkit/quota/quota_manager.h |
@@ -18,12 +18,12 @@ |
#include "base/callback.h" |
#include "base/file_path.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/weak_ptr.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/sequenced_task_runner_helpers.h" |
-#include "webkit/quota/quota_database.h" |
#include "webkit/quota/quota_client.h" |
+#include "webkit/quota/quota_database.h" |
#include "webkit/quota/quota_task.h" |
#include "webkit/quota/quota_types.h" |
#include "webkit/quota/special_storage_policy.h" |
@@ -31,7 +31,8 @@ |
class FilePath; |
namespace base { |
-class MessageLoopProxy; |
+class SequencedTaskRunner; |
+class SingleThreadTaskRunner; |
} |
namespace quota_internals { |
@@ -106,8 +107,8 @@ class QuotaManager : public QuotaTaskObserver, |
QuotaManager(bool is_incognito, |
const FilePath& profile_path, |
- base::MessageLoopProxy* io_thread, |
- base::MessageLoopProxy* db_thread, |
+ base::SingleThreadTaskRunner* io_thread, |
+ base::SequencedTaskRunner* db_thread, |
SpecialStoragePolicy* special_storage_policy); |
// Returns a proxy object that can be used on any thread. |
@@ -352,8 +353,8 @@ class QuotaManager : public QuotaTaskObserver, |
scoped_refptr<QuotaManagerProxy> proxy_; |
bool db_disabled_; |
bool eviction_disabled_; |
- scoped_refptr<base::MessageLoopProxy> io_thread_; |
- scoped_refptr<base::MessageLoopProxy> db_thread_; |
+ scoped_refptr<base::SingleThreadTaskRunner> io_thread_; |
+ scoped_refptr<base::SequencedTaskRunner> db_thread_; |
mutable scoped_ptr<QuotaDatabase> database_; |
GetLRUOriginCallback lru_origin_callback_; |
@@ -418,11 +419,12 @@ class QuotaManagerProxy |
friend class QuotaManager; |
friend class base::RefCountedThreadSafe<QuotaManagerProxy>; |
- QuotaManagerProxy(QuotaManager* manager, base::MessageLoopProxy* io_thread); |
+ QuotaManagerProxy(QuotaManager* manager, |
+ base::SingleThreadTaskRunner* io_thread); |
virtual ~QuotaManagerProxy(); |
QuotaManager* manager_; // only accessed on the io thread |
- scoped_refptr<base::MessageLoopProxy> io_thread_; |
+ scoped_refptr<base::SingleThreadTaskRunner> io_thread_; |
DISALLOW_COPY_AND_ASSIGN(QuotaManagerProxy); |
}; |