| Index: android_webview/browser/net/aw_cookie_store_wrapper.cc
|
| diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.cc b/android_webview/browser/net/aw_cookie_store_wrapper.cc
|
| index 811e775cda493acc74d111e630a9240e784ec0b2..70f7b4c031793bb3b56e796d94ce032516bbb3e5 100644
|
| --- a/android_webview/browser/net/aw_cookie_store_wrapper.cc
|
| +++ b/android_webview/browser/net/aw_cookie_store_wrapper.cc
|
| @@ -202,7 +202,7 @@ void AwCookieStoreWrapper::SetCookieWithOptionsAsync(
|
| const std::string& cookie_line,
|
| const net::CookieOptions& options,
|
| const net::CookieStore::SetCookiesCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&SetCookieWithOptionsAsyncOnCookieThread, url, cookie_line,
|
| options, CreateWrappedCallback<bool>(callback)));
|
| @@ -222,7 +222,7 @@ void AwCookieStoreWrapper::SetCookieWithDetailsAsync(
|
| net::CookieSameSite same_site,
|
| net::CookiePriority priority,
|
| const SetCookiesCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&SetCookieWithDetailsAsyncOnCookieThread, url, name, value,
|
| domain, path, creation_time, expiration_time, last_access_time,
|
| @@ -234,7 +234,7 @@ void AwCookieStoreWrapper::GetCookiesWithOptionsAsync(
|
| const GURL& url,
|
| const net::CookieOptions& options,
|
| const GetCookiesCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&GetCookiesWithOptionsAsyncOnCookieThread, url, options,
|
| CreateWrappedCallback<const std::string&>(callback)));
|
| @@ -244,7 +244,7 @@ void AwCookieStoreWrapper::GetCookieListWithOptionsAsync(
|
| const GURL& url,
|
| const net::CookieOptions& options,
|
| const GetCookieListCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&GetCookieListWithOptionsAsyncOnCookieThread, url, options,
|
| CreateWrappedCallback<const net::CookieList&>(callback)));
|
| @@ -252,7 +252,7 @@ void AwCookieStoreWrapper::GetCookieListWithOptionsAsync(
|
|
|
| void AwCookieStoreWrapper::GetAllCookiesAsync(
|
| const GetCookieListCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&GetAllCookiesAsyncOnCookieThread,
|
| CreateWrappedCallback<const net::CookieList&>(callback)));
|
| @@ -261,7 +261,7 @@ void AwCookieStoreWrapper::GetAllCookiesAsync(
|
| void AwCookieStoreWrapper::DeleteCookieAsync(const GURL& url,
|
| const std::string& cookie_name,
|
| const base::Closure& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&DeleteCookieAsyncOnCookieThread, url, cookie_name,
|
| CreateWrappedClosureCallback(callback)));
|
| @@ -270,7 +270,7 @@ void AwCookieStoreWrapper::DeleteCookieAsync(const GURL& url,
|
| void AwCookieStoreWrapper::DeleteCanonicalCookieAsync(
|
| const net::CanonicalCookie& cookie,
|
| const DeleteCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&DeleteCanonicalCookieAsyncOnCookieThread, cookie,
|
| CreateWrappedCallback<int>(callback)));
|
| @@ -280,7 +280,7 @@ void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync(
|
| const base::Time& delete_begin,
|
| const base::Time& delete_end,
|
| const DeleteCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&DeleteAllCreatedBetweenAsyncOnCookieThread, delete_begin,
|
| delete_end, CreateWrappedCallback<int>(callback)));
|
| @@ -291,7 +291,7 @@ void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync(
|
| const base::Time& delete_end,
|
| const CookiePredicate& predicate,
|
| const DeleteCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(base::Bind(
|
| &DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread, delete_begin,
|
| delete_end, predicate, CreateWrappedCallback<int>(callback)));
|
| @@ -299,20 +299,20 @@ void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync(
|
|
|
| void AwCookieStoreWrapper::DeleteSessionCookiesAsync(
|
| const DeleteCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&DeleteSessionCookiesAsyncOnCookieThread,
|
| CreateWrappedCallback<int>(callback)));
|
| }
|
|
|
| void AwCookieStoreWrapper::FlushStore(const base::Closure& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(base::Bind(
|
| &FlushStoreOnCookieThread, CreateWrappedClosureCallback(callback)));
|
| }
|
|
|
| void AwCookieStoreWrapper::SetForceKeepSessionState() {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| PostTaskToCookieStoreTaskRunner(
|
| base::Bind(&SetForceKeepSessionStateOnCookieThread));
|
| }
|
| @@ -322,7 +322,7 @@ AwCookieStoreWrapper::AddCallbackForCookie(
|
| const GURL& url,
|
| const std::string& name,
|
| const CookieChangedCallback& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // The SubscriptionWrapper is owned by the subscription itself, and has no
|
| // connection to the AwCookieStoreWrapper after creation. Other CookieStore
|
| @@ -349,7 +349,7 @@ base::Closure AwCookieStoreWrapper::CreateWrappedClosureCallback(
|
| }
|
|
|
| void AwCookieStoreWrapper::RunClosureCallback(const base::Closure& callback) {
|
| - DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(client_task_runner_->RunsTasksInCurrentSequence());
|
| callback.Run();
|
| }
|
|
|
|
|