| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/browser/net/aw_cookie_store_wrapper.h" | 5 #include "android_webview/browser/net/aw_cookie_store_wrapper.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "android_webview/browser/net/init_native_callback.h" | 9 #include "android_webview/browser/net/init_native_callback.h" |
| 10 #include "base/memory/ref_counted_delete_on_sequence.h" | 10 #include "base/memory/ref_counted_delete_on_sequence.h" |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 : client_task_runner_(base::ThreadTaskRunnerHandle::Get()), | 195 : client_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
| 196 weak_factory_(this) {} | 196 weak_factory_(this) {} |
| 197 | 197 |
| 198 AwCookieStoreWrapper::~AwCookieStoreWrapper() {} | 198 AwCookieStoreWrapper::~AwCookieStoreWrapper() {} |
| 199 | 199 |
| 200 void AwCookieStoreWrapper::SetCookieWithOptionsAsync( | 200 void AwCookieStoreWrapper::SetCookieWithOptionsAsync( |
| 201 const GURL& url, | 201 const GURL& url, |
| 202 const std::string& cookie_line, | 202 const std::string& cookie_line, |
| 203 const net::CookieOptions& options, | 203 const net::CookieOptions& options, |
| 204 const net::CookieStore::SetCookiesCallback& callback) { | 204 const net::CookieStore::SetCookiesCallback& callback) { |
| 205 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 205 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 206 PostTaskToCookieStoreTaskRunner( | 206 PostTaskToCookieStoreTaskRunner( |
| 207 base::Bind(&SetCookieWithOptionsAsyncOnCookieThread, url, cookie_line, | 207 base::Bind(&SetCookieWithOptionsAsyncOnCookieThread, url, cookie_line, |
| 208 options, CreateWrappedCallback<bool>(callback))); | 208 options, CreateWrappedCallback<bool>(callback))); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void AwCookieStoreWrapper::SetCookieWithDetailsAsync( | 211 void AwCookieStoreWrapper::SetCookieWithDetailsAsync( |
| 212 const GURL& url, | 212 const GURL& url, |
| 213 const std::string& name, | 213 const std::string& name, |
| 214 const std::string& value, | 214 const std::string& value, |
| 215 const std::string& domain, | 215 const std::string& domain, |
| 216 const std::string& path, | 216 const std::string& path, |
| 217 base::Time creation_time, | 217 base::Time creation_time, |
| 218 base::Time expiration_time, | 218 base::Time expiration_time, |
| 219 base::Time last_access_time, | 219 base::Time last_access_time, |
| 220 bool secure, | 220 bool secure, |
| 221 bool http_only, | 221 bool http_only, |
| 222 net::CookieSameSite same_site, | 222 net::CookieSameSite same_site, |
| 223 net::CookiePriority priority, | 223 net::CookiePriority priority, |
| 224 const SetCookiesCallback& callback) { | 224 const SetCookiesCallback& callback) { |
| 225 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 225 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 226 PostTaskToCookieStoreTaskRunner( | 226 PostTaskToCookieStoreTaskRunner( |
| 227 base::Bind(&SetCookieWithDetailsAsyncOnCookieThread, url, name, value, | 227 base::Bind(&SetCookieWithDetailsAsyncOnCookieThread, url, name, value, |
| 228 domain, path, creation_time, expiration_time, last_access_time, | 228 domain, path, creation_time, expiration_time, last_access_time, |
| 229 secure, http_only, same_site, priority, | 229 secure, http_only, same_site, priority, |
| 230 CreateWrappedCallback<bool>(callback))); | 230 CreateWrappedCallback<bool>(callback))); |
| 231 } | 231 } |
| 232 | 232 |
| 233 void AwCookieStoreWrapper::GetCookiesWithOptionsAsync( | 233 void AwCookieStoreWrapper::GetCookiesWithOptionsAsync( |
| 234 const GURL& url, | 234 const GURL& url, |
| 235 const net::CookieOptions& options, | 235 const net::CookieOptions& options, |
| 236 const GetCookiesCallback& callback) { | 236 const GetCookiesCallback& callback) { |
| 237 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 237 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 238 PostTaskToCookieStoreTaskRunner( | 238 PostTaskToCookieStoreTaskRunner( |
| 239 base::Bind(&GetCookiesWithOptionsAsyncOnCookieThread, url, options, | 239 base::Bind(&GetCookiesWithOptionsAsyncOnCookieThread, url, options, |
| 240 CreateWrappedCallback<const std::string&>(callback))); | 240 CreateWrappedCallback<const std::string&>(callback))); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void AwCookieStoreWrapper::GetCookieListWithOptionsAsync( | 243 void AwCookieStoreWrapper::GetCookieListWithOptionsAsync( |
| 244 const GURL& url, | 244 const GURL& url, |
| 245 const net::CookieOptions& options, | 245 const net::CookieOptions& options, |
| 246 const GetCookieListCallback& callback) { | 246 const GetCookieListCallback& callback) { |
| 247 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 247 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 248 PostTaskToCookieStoreTaskRunner( | 248 PostTaskToCookieStoreTaskRunner( |
| 249 base::Bind(&GetCookieListWithOptionsAsyncOnCookieThread, url, options, | 249 base::Bind(&GetCookieListWithOptionsAsyncOnCookieThread, url, options, |
| 250 CreateWrappedCallback<const net::CookieList&>(callback))); | 250 CreateWrappedCallback<const net::CookieList&>(callback))); |
| 251 } | 251 } |
| 252 | 252 |
| 253 void AwCookieStoreWrapper::GetAllCookiesAsync( | 253 void AwCookieStoreWrapper::GetAllCookiesAsync( |
| 254 const GetCookieListCallback& callback) { | 254 const GetCookieListCallback& callback) { |
| 255 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 255 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 256 PostTaskToCookieStoreTaskRunner( | 256 PostTaskToCookieStoreTaskRunner( |
| 257 base::Bind(&GetAllCookiesAsyncOnCookieThread, | 257 base::Bind(&GetAllCookiesAsyncOnCookieThread, |
| 258 CreateWrappedCallback<const net::CookieList&>(callback))); | 258 CreateWrappedCallback<const net::CookieList&>(callback))); |
| 259 } | 259 } |
| 260 | 260 |
| 261 void AwCookieStoreWrapper::DeleteCookieAsync(const GURL& url, | 261 void AwCookieStoreWrapper::DeleteCookieAsync(const GURL& url, |
| 262 const std::string& cookie_name, | 262 const std::string& cookie_name, |
| 263 const base::Closure& callback) { | 263 const base::Closure& callback) { |
| 264 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 264 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 265 PostTaskToCookieStoreTaskRunner( | 265 PostTaskToCookieStoreTaskRunner( |
| 266 base::Bind(&DeleteCookieAsyncOnCookieThread, url, cookie_name, | 266 base::Bind(&DeleteCookieAsyncOnCookieThread, url, cookie_name, |
| 267 CreateWrappedClosureCallback(callback))); | 267 CreateWrappedClosureCallback(callback))); |
| 268 } | 268 } |
| 269 | 269 |
| 270 void AwCookieStoreWrapper::DeleteCanonicalCookieAsync( | 270 void AwCookieStoreWrapper::DeleteCanonicalCookieAsync( |
| 271 const net::CanonicalCookie& cookie, | 271 const net::CanonicalCookie& cookie, |
| 272 const DeleteCallback& callback) { | 272 const DeleteCallback& callback) { |
| 273 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 273 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 274 PostTaskToCookieStoreTaskRunner( | 274 PostTaskToCookieStoreTaskRunner( |
| 275 base::Bind(&DeleteCanonicalCookieAsyncOnCookieThread, cookie, | 275 base::Bind(&DeleteCanonicalCookieAsyncOnCookieThread, cookie, |
| 276 CreateWrappedCallback<int>(callback))); | 276 CreateWrappedCallback<int>(callback))); |
| 277 } | 277 } |
| 278 | 278 |
| 279 void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync( | 279 void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync( |
| 280 const base::Time& delete_begin, | 280 const base::Time& delete_begin, |
| 281 const base::Time& delete_end, | 281 const base::Time& delete_end, |
| 282 const DeleteCallback& callback) { | 282 const DeleteCallback& callback) { |
| 283 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 283 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 284 PostTaskToCookieStoreTaskRunner( | 284 PostTaskToCookieStoreTaskRunner( |
| 285 base::Bind(&DeleteAllCreatedBetweenAsyncOnCookieThread, delete_begin, | 285 base::Bind(&DeleteAllCreatedBetweenAsyncOnCookieThread, delete_begin, |
| 286 delete_end, CreateWrappedCallback<int>(callback))); | 286 delete_end, CreateWrappedCallback<int>(callback))); |
| 287 } | 287 } |
| 288 | 288 |
| 289 void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync( | 289 void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync( |
| 290 const base::Time& delete_begin, | 290 const base::Time& delete_begin, |
| 291 const base::Time& delete_end, | 291 const base::Time& delete_end, |
| 292 const CookiePredicate& predicate, | 292 const CookiePredicate& predicate, |
| 293 const DeleteCallback& callback) { | 293 const DeleteCallback& callback) { |
| 294 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 294 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 295 PostTaskToCookieStoreTaskRunner(base::Bind( | 295 PostTaskToCookieStoreTaskRunner(base::Bind( |
| 296 &DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread, delete_begin, | 296 &DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread, delete_begin, |
| 297 delete_end, predicate, CreateWrappedCallback<int>(callback))); | 297 delete_end, predicate, CreateWrappedCallback<int>(callback))); |
| 298 } | 298 } |
| 299 | 299 |
| 300 void AwCookieStoreWrapper::DeleteSessionCookiesAsync( | 300 void AwCookieStoreWrapper::DeleteSessionCookiesAsync( |
| 301 const DeleteCallback& callback) { | 301 const DeleteCallback& callback) { |
| 302 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 302 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 303 PostTaskToCookieStoreTaskRunner( | 303 PostTaskToCookieStoreTaskRunner( |
| 304 base::Bind(&DeleteSessionCookiesAsyncOnCookieThread, | 304 base::Bind(&DeleteSessionCookiesAsyncOnCookieThread, |
| 305 CreateWrappedCallback<int>(callback))); | 305 CreateWrappedCallback<int>(callback))); |
| 306 } | 306 } |
| 307 | 307 |
| 308 void AwCookieStoreWrapper::FlushStore(const base::Closure& callback) { | 308 void AwCookieStoreWrapper::FlushStore(const base::Closure& callback) { |
| 309 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 309 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 310 PostTaskToCookieStoreTaskRunner(base::Bind( | 310 PostTaskToCookieStoreTaskRunner(base::Bind( |
| 311 &FlushStoreOnCookieThread, CreateWrappedClosureCallback(callback))); | 311 &FlushStoreOnCookieThread, CreateWrappedClosureCallback(callback))); |
| 312 } | 312 } |
| 313 | 313 |
| 314 void AwCookieStoreWrapper::SetForceKeepSessionState() { | 314 void AwCookieStoreWrapper::SetForceKeepSessionState() { |
| 315 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 315 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 316 PostTaskToCookieStoreTaskRunner( | 316 PostTaskToCookieStoreTaskRunner( |
| 317 base::Bind(&SetForceKeepSessionStateOnCookieThread)); | 317 base::Bind(&SetForceKeepSessionStateOnCookieThread)); |
| 318 } | 318 } |
| 319 | 319 |
| 320 std::unique_ptr<net::CookieStore::CookieChangedSubscription> | 320 std::unique_ptr<net::CookieStore::CookieChangedSubscription> |
| 321 AwCookieStoreWrapper::AddCallbackForCookie( | 321 AwCookieStoreWrapper::AddCallbackForCookie( |
| 322 const GURL& url, | 322 const GURL& url, |
| 323 const std::string& name, | 323 const std::string& name, |
| 324 const CookieChangedCallback& callback) { | 324 const CookieChangedCallback& callback) { |
| 325 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 325 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 326 | 326 |
| 327 // The SubscriptionWrapper is owned by the subscription itself, and has no | 327 // The SubscriptionWrapper is owned by the subscription itself, and has no |
| 328 // connection to the AwCookieStoreWrapper after creation. Other CookieStore | 328 // connection to the AwCookieStoreWrapper after creation. Other CookieStore |
| 329 // implementations DCHECK if a subscription outlasts the cookie store, | 329 // implementations DCHECK if a subscription outlasts the cookie store, |
| 330 // unfortunately, this design makes DCHECKing if there's an outstanding | 330 // unfortunately, this design makes DCHECKing if there's an outstanding |
| 331 // subscription when the AwCookieStoreWrapper is destroyed a bit ugly. | 331 // subscription when the AwCookieStoreWrapper is destroyed a bit ugly. |
| 332 // TODO(mmenke): Still worth adding a DCHECK? | 332 // TODO(mmenke): Still worth adding a DCHECK? |
| 333 SubscriptionWrapper* subscription = new SubscriptionWrapper(); | 333 SubscriptionWrapper* subscription = new SubscriptionWrapper(); |
| 334 return subscription->Subscribe(url, name, callback); | 334 return subscription->Subscribe(url, name, callback); |
| 335 } | 335 } |
| 336 | 336 |
| 337 bool AwCookieStoreWrapper::IsEphemeral() { | 337 bool AwCookieStoreWrapper::IsEphemeral() { |
| 338 return GetCookieStore()->IsEphemeral(); | 338 return GetCookieStore()->IsEphemeral(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 base::Closure AwCookieStoreWrapper::CreateWrappedClosureCallback( | 341 base::Closure AwCookieStoreWrapper::CreateWrappedClosureCallback( |
| 342 const base::Closure& callback) { | 342 const base::Closure& callback) { |
| 343 if (callback.is_null()) | 343 if (callback.is_null()) |
| 344 return callback; | 344 return callback; |
| 345 return base::Bind(base::IgnoreResult(&base::TaskRunner::PostTask), | 345 return base::Bind(base::IgnoreResult(&base::TaskRunner::PostTask), |
| 346 client_task_runner_, FROM_HERE, | 346 client_task_runner_, FROM_HERE, |
| 347 base::Bind(&AwCookieStoreWrapper::RunClosureCallback, | 347 base::Bind(&AwCookieStoreWrapper::RunClosureCallback, |
| 348 weak_factory_.GetWeakPtr(), callback)); | 348 weak_factory_.GetWeakPtr(), callback)); |
| 349 } | 349 } |
| 350 | 350 |
| 351 void AwCookieStoreWrapper::RunClosureCallback(const base::Closure& callback) { | 351 void AwCookieStoreWrapper::RunClosureCallback(const base::Closure& callback) { |
| 352 DCHECK(client_task_runner_->RunsTasksOnCurrentThread()); | 352 DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); |
| 353 callback.Run(); | 353 callback.Run(); |
| 354 } | 354 } |
| 355 | 355 |
| 356 } // namespace android_webview | 356 } // namespace android_webview |
| OLD | NEW |