summaryrefslogtreecommitdiffstats
path: root/android_webview/native/cookie_manager.cc
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-05-07 10:23:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-07 17:23:52 +0000
commit33a1319da58c077317861a7367d9835c55441a42 (patch)
treee4d2c95b1e34924bcfaa073bc60506138beae446 /android_webview/native/cookie_manager.cc
parentfa4d1f32690b749496963058d53b90ab9e59769a (diff)
downloadchromium_src-33a1319da58c077317861a7367d9835c55441a42.zip
chromium_src-33a1319da58c077317861a7367d9835c55441a42.tar.gz
chromium_src-33a1319da58c077317861a7367d9835c55441a42.tar.bz2
android_webview: Remove use of MessageLoopProxy and deprecated MessageLoop APIs
This patch was autogenerated with https://codereview.chromium.org/1010073002/. BUG=465354 Review URL: https://codereview.chromium.org/1129063006 Cr-Commit-Position: refs/heads/master@{#328784}
Diffstat (limited to 'android_webview/native/cookie_manager.cc')
-rw-r--r--android_webview/native/cookie_manager.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc
index f876d42..232254d 100644
--- a/android_webview/native/cookie_manager.cc
+++ b/android_webview/native/cookie_manager.cc
@@ -16,9 +16,9 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/lazy_instance.h"
-#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/location.h"
#include "base/path_service.h"
+#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/sequenced_worker_pool.h"
@@ -208,7 +208,7 @@ class CookieManager {
void SetAcceptFileSchemeCookiesLocked(bool accept);
scoped_refptr<net::CookieMonster> cookie_monster_;
- scoped_refptr<base::MessageLoopProxy> cookie_monster_proxy_;
+ scoped_refptr<base::SingleThreadTaskRunner> cookie_monster_task_runner_;
base::Lock cookie_monster_lock_;
scoped_ptr<base::Thread> cookie_monster_client_thread_;
@@ -265,14 +265,13 @@ void CookieManager::EnsureCookieMonsterExistsLocked() {
cookie_monster_client_thread_.reset(
new base::Thread("CookieMonsterClient"));
cookie_monster_client_thread_->Start();
- cookie_monster_proxy_ = cookie_monster_client_thread_->message_loop_proxy();
+ cookie_monster_task_runner_ = cookie_monster_client_thread_->task_runner();
cookie_monster_backend_thread_.reset(
new base::Thread("CookieMonsterBackend"));
cookie_monster_backend_thread_->Start();
- CreateCookieMonster(user_data_dir,
- cookie_monster_proxy_,
- cookie_monster_backend_thread_->message_loop_proxy());
+ CreateCookieMonster(user_data_dir, cookie_monster_task_runner_,
+ cookie_monster_backend_thread_->task_runner());
}
// Executes the |task| on the |cookie_monster_proxy_| message loop and
@@ -319,7 +318,7 @@ void CookieManager::ExecCookieTaskSync(
void CookieManager::ExecCookieTask(const base::Closure& task) {
base::AutoLock lock(cookie_monster_lock_);
EnsureCookieMonsterExistsLocked();
- cookie_monster_proxy_->PostTask(FROM_HERE, task);
+ cookie_monster_task_runner_->PostTask(FROM_HERE, task);
}
scoped_refptr<net::CookieStore> CookieManager::GetCookieStore() {