| Index: content/browser/net/sqlite_persistent_cookie_store.cc
|
| diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc
|
| index 3f293f6c6b6b06095f4320a70b0c23cc3a2523bb..60b7cff7d044b484a7e9488112bff518072d06c0 100644
|
| --- a/content/browser/net/sqlite_persistent_cookie_store.cc
|
| +++ b/content/browser/net/sqlite_persistent_cookie_store.cc
|
| @@ -695,9 +695,6 @@
|
| 50);
|
|
|
| initialized_ = true;
|
| -
|
| - if (!restore_old_session_cookies_)
|
| - DeleteSessionCookiesOnStartup();
|
| return true;
|
| }
|
|
|
| @@ -1293,7 +1290,7 @@
|
|
|
| void SQLitePersistentCookieStore::Backend::DeleteSessionCookiesOnStartup() {
|
| DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| - if (!db_->Execute("DELETE FROM cookies WHERE persistent != 1"))
|
| + if (!db_->Execute("DELETE FROM cookies WHERE persistent == 0"))
|
| LOG(WARNING) << "Unable to delete session cookies.";
|
| }
|
|
|
| @@ -1318,6 +1315,8 @@
|
| bool success) {
|
| PostClientTask(FROM_HERE, base::Bind(&Backend::CompleteLoadInForeground, this,
|
| loaded_callback, success));
|
| + if (success && !restore_old_session_cookies_)
|
| + DeleteSessionCookiesOnStartup();
|
| }
|
|
|
| SQLitePersistentCookieStore::SQLitePersistentCookieStore(
|
|
|