diff options
Diffstat (limited to 'chrome/browser/net/sqlite_persistent_cookie_store.cc')
| -rw-r--r-- | chrome/browser/net/sqlite_persistent_cookie_store.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 60ed27a..af9e753 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -265,19 +265,13 @@ bool SQLitePersistentCookieStore::Backend::Load( Time::FromInternalValue(smt.ColumnInt64(0)), // creation_utc Time::FromInternalValue(smt.ColumnInt64(5)), // expires_utc Time::FromInternalValue(smt.ColumnInt64(8)), // last_access_utc -<<<<<<< HEAD -#if defined(ANDROID) - !expires.is_null(), // has_expires - expires)); // expires_utc -#else - true, // has_expires - Time::FromInternalValue(smt.ColumnInt64(5)))); // expires_utc -#endif -======= smt.ColumnInt(6) != 0, // secure smt.ColumnInt(7) != 0, // httponly +#if defined(ANDROID) + !expires.is_null())); // has_expires +#else true)); // has_expires ->>>>>>> chromium.org at r12.0.742.93 +#endif DLOG_IF(WARNING, cc->CreationDate() > Time::Now()) << L"CreationDate too recent"; cookies->push_back(cc.release()); |