diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 17:16:37 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 17:16:37 +0000 |
| commit | dcc6432defe5e686ee152926613e14cd0e07e175 (patch) | |
| tree | 19cf0e577b0167fad903d80744ac1d6940a085b4 /chrome | |
| parent | bc4db526bda153375e72fe583ce32ed125e9b306 (diff) | |
| download | chromium_src-dcc6432defe5e686ee152926613e14cd0e07e175.zip chromium_src-dcc6432defe5e686ee152926613e14cd0e07e175.tar.gz chromium_src-dcc6432defe5e686ee152926613e14cd0e07e175.tar.bz2 | |
More cleanup relating to the domain now being part of the CanonicalCookie:
* Simplify DeleteCookie(CanonicalCookie) API
* Get rid of KeyedCanonicalCookie type; not needed.
BUG=8850
TEST=Try bots, net_unittest --gtest_filter=CookieMonsterTest.* (refactor, so tests should all keep passing.)
Review URL: http://codereview.chromium.org/3095002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cookies_tree_model.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/net/sqlite_persistent_cookie_store.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/net/sqlite_persistent_cookie_store.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 37d682f..7c33067 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -59,8 +59,7 @@ void CookieTreeCookieNode::DeleteStoredObjects() { // vector storing the cookies in-tact and not delete from there (that would // invalidate our pointers), and the fact that it contains semi out-of-date // data is not problematic as we don't re-build the model based on that. - GetModel()->cookie_monster_-> - DeleteCookie(cookie_->Domain(), *cookie_, true); + GetModel()->cookie_monster_->DeleteCanonicalCookie(*cookie_); } namespace { diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 8649eb5..f8d46d3 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -308,7 +308,7 @@ bool InitTable(sql::Connection* db) { } // namespace bool SQLitePersistentCookieStore::Load( - std::vector<net::CookieMonster::KeyedCanonicalCookie>* cookies) { + std::vector<net::CookieMonster::CanonicalCookie*>* cookies) { scoped_ptr<sql::Connection> db(new sql::Connection); if (!db->Open(path_)) { NOTREACHED() << "Unable to open cookie DB."; @@ -348,9 +348,7 @@ bool SQLitePersistentCookieStore::Load( Time::FromInternalValue(smt.ColumnInt64(5)))); // expires_utc DLOG_IF(WARNING, cc->CreationDate() > Time::Now()) << L"CreationDate too recent"; - cookies->push_back( - net::CookieMonster::KeyedCanonicalCookie(smt.ColumnString(1), - cc.release())); + cookies->push_back(cc.release()); } // Create the backend, this will take ownership of the db pointer. diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h index 998965d..6ba945e 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.h +++ b/chrome/browser/net/sqlite_persistent_cookie_store.h @@ -28,7 +28,7 @@ class SQLitePersistentCookieStore explicit SQLitePersistentCookieStore(const FilePath& path); ~SQLitePersistentCookieStore(); - virtual bool Load(std::vector<net::CookieMonster::KeyedCanonicalCookie>*); + virtual bool Load(std::vector<net::CookieMonster::CanonicalCookie*>*); virtual void AddCookie(const std::string&, const net::CookieMonster::CanonicalCookie&); |