Chromium Code Reviews| Index: webkit/quota/quota_manager.h |
| diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h |
| index 65361521ac9e697bdd0253d28228ec23037e7ad4..72322c40eb66b02642735a11333943e88160001e 100644 |
| --- a/webkit/quota/quota_manager.h |
| +++ b/webkit/quota/quota_manager.h |
| @@ -18,9 +18,9 @@ |
| #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 "webkit/quota/quota_database.h" |
| #include "webkit/quota/quota_client.h" |
| #include "webkit/quota/quota_task.h" |
| @@ -30,7 +30,8 @@ |
| class FilePath; |
| namespace base { |
| -class MessageLoopProxy; |
| +class SequencedTaskRunner; |
| +class SingleThreadTaskRunner; |
| } |
| namespace quota_internals { |
| @@ -105,8 +106,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, |
|
michaeln
2012/04/27 01:04:03
Yup... SingleThread for the first, Sequenced for t
|
| SpecialStoragePolicy* special_storage_policy); |
| virtual ~QuotaManager(); |
| @@ -349,8 +350,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_; |
| @@ -415,11 +416,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); |
| }; |