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&);