diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 18:06:10 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:05 +0100 |
| commit | f90e3b770dd989e0cfbe7c69498cbd21c3bbe7ec (patch) | |
| tree | 676eabcf32710896d09d5539717d49b7573a3634 /chrome | |
| parent | c4807fda701ab2f97057a2967cf7b5eb766d5452 (diff) | |
| download | external_chromium-f90e3b770dd989e0cfbe7c69498cbd21c3bbe7ec.zip external_chromium-f90e3b770dd989e0cfbe7c69498cbd21c3bbe7ec.tar.gz external_chromium-f90e3b770dd989e0cfbe7c69498cbd21c3bbe7ec.tar.bz2 | |
Merge Chromium at r12.0.742.93: Fix conflicts in sqlite_persistent_cookie_store.cc
Change close to local edit, simplified local change a bit:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=88489&r1=82094&r2=82095
Change-Id: I89c277744c9cdcd95a40ab7fb9dbc363dff487f8
Diffstat (limited to 'chrome')
| -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()); |