Promote CookieMonster::DeleteCanonicalCookieAsync to CookieStore.

net/cookies/cookie_monster.h

Index: net/cookies/cookie_monster.h
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index 4dcb23dc645900d68824eb4e85f10a3eb69a6521..c29b3696de8d06769c6e61fdb51d01c6197ca211 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -146,9 +146,6 @@ class NET_EXPORT CookieMonster : public CookieStore {
                 CookieMonsterDelegate* delegate,
                 int last_access_threshold_milliseconds);
 
-  typedef base::Callback<void(const CookieList& cookies)> GetCookieListCallback;
-  typedef base::Callback<void(bool success)> DeleteCookieCallback;
-
   // Returns all the cookies, for use in management UI, etc. Filters results
   // using given url scheme, host / domain and path and options. This does not
   // mark the cookies as having been accessed.
@@ -159,10 +156,6 @@ class NET_EXPORT CookieMonster : public CookieStore {
       const CookieOptions& options,
       const GetCookieListCallback& callback);
 
-  // Deletes one specific cookie.
-  void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie,
-                                  const DeleteCookieCallback& callback);
-
   // Replaces all the cookies by |list|. This method does not flush the backend.
   void SetAllCookiesAsync(const CookieList& list,
                           const SetCookiesCallback& callback);
@@ -195,6 +188,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
   void DeleteCookieAsync(const GURL& url,
                          const std::string& cookie_name,
                          const base::Closure& callback) override;
+  void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie,
+                                  const DeleteCallback& callback) override;
   void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin,
                                     const base::Time& delete_end,
                                     const DeleteCallback& callback) override;
@@ -436,8 +431,6 @@ class NET_EXPORT CookieMonster : public CookieStore {
                                      const base::Time delete_end,
                                      const GURL& url);
 
-  bool DeleteCanonicalCookie(const CanonicalCookie& cookie);
-
   bool SetCookieWithOptions(const GURL& url,
                             const std::string& cookie_line,
                             const CookieOptions& options);
@@ -447,6 +440,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
 
   void DeleteCookie(const GURL& url, const std::string& cookie_name);
 
+  int DeleteCanonicalCookie(const CanonicalCookie& cookie);
+
   bool SetCookieWithCreationTime(const GURL& url,
                                  const std::string& cookie_line,
                                  const base::Time& creation_time);