Pass a RemovalCause to CookieChangedCallback

net/cookies/cookie_store.h

Index: net/cookies/cookie_store.h
diff --git a/net/cookies/cookie_store.h b/net/cookies/cookie_store.h
index f56fedd90392877b24e554276579a12733617700..dd2cff9e725d57d126230d80a33c165e3e8d3b9c 100644
--- a/net/cookies/cookie_store.h
+++ b/net/cookies/cookie_store.h
@@ -33,14 +33,36 @@ class CookieMonster;
 // Destroying the CookieStore will cancel pending async callbacks.
 class NET_EXPORT CookieStore {
  public:
+  // The publicly relevant reasons a cookie might be changed.
+  enum ChangeCause {
+    // The cookie was inserted.
+    CHANGE_COOKIE_INSERTED,

[mmenke, 2016/09/26 18:29:26]

Can we make this an enum class (And maybe get rid of the prefix)?

i.e. CookieStore::ChangeCause::INSERTED

[nharper, 2016/09/26 21:09:10]

Done.

+    // The cookie was changed directly by a consumer's action.
+    CHANGE_COOKIE_EXPLICIT,
+    // The cookie was deleted, but no more details are known.
+    CHANGE_COOKIE_UNKNOWN_DELETION,
+    // The cookie was automatically removed due to an insert operation that
+    // overwrote it.
+    CHANGE_COOKIE_OVERWRITE,
+    // The cookie was automatically removed as it expired.
+    CHANGE_COOKIE_EXPIRED,
+    // The cookie was automatically evicted during garbage collection.
+    CHANGE_COOKIE_EVICTED,
+    // The cookie was overwritten with an already-expired expiration date.
+    CHANGE_COOKIE_EXPIRED_OVERWRITE
+  };
+
+  static bool ChangeCauseIsDeletion(ChangeCause cause);
+
   // Callback definitions.
   typedef base::Callback<void(const CookieList& cookies)> GetCookieListCallback;
   typedef base::Callback<void(const std::string& cookie)> GetCookiesCallback;
   typedef base::Callback<void(bool success)> SetCookiesCallback;
   typedef base::Callback<void(int num_deleted)> DeleteCallback;
-  typedef base::Callback<void(const CanonicalCookie& cookie, bool removed)>
+  typedef base::Callback<void(const CanonicalCookie& cookie, ChangeCause cause)>
       CookieChangedCallback;
-  typedef base::CallbackList<void(const CanonicalCookie& cookie, bool removed)>
+  typedef base::CallbackList<void(const CanonicalCookie& cookie,
+                                  ChangeCause cause)>

[Mike West, 2016/09/26 07:55:37]

Can you add some tests for this change? It looks like the changes to the
existing unit tests fold all deletion types together to replicate the old
interface. It would be great to verify that you're getting the correct values
out based upon what's passed in.

[nharper, 2016/09/26 21:09:10]

I've updated cookie_monster_unittest.cc to check the types. I could also make
the same change to cookie_store_ios_unittest.mm if you'd like.

       CookieChangedCallbackList;
   typedef CookieChangedCallbackList::Subscription CookieChangedSubscription;
   typedef base::Callback<bool(const CanonicalCookie& cookie)> CookiePredicate;