Flush Channel IDs when Cookies get saved to a persistent backend

net/cookies/cookie_monster.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_COOKIES_COOKIE_MONSTER_H_
 #define NET_COOKIES_COOKIE_MONSTER_H_
 
 #include <stddef.h>
@@ skipping 20 matching lines @@
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_store.h"
 #include "url/gurl.h"
 
 namespace base {
 class HistogramBase;
 }  // namespace base
 
 namespace net {
 
+class ChannelIDService;
 class CookieMonsterDelegate;
 
 // The cookie monster is the system for storing and retrieving cookies. It has
 // an in-memory list of all cookies, and synchronizes non-session cookies to an
 // optional permanent storage that implements the PersistentCookieStore
 // interface.
 //
 // Tasks may be deferred if all affected cookies are not yet loaded from the
 // backing store. Otherwise, callbacks may be invoked immediately.
 //
@@ skipping 76 matching lines @@
   static const size_t kDomainCookiesQuotaHigh;
 
   // The store passed in should not have had Init() called on it yet. This
   // class will take care of initializing it. The backing store is NOT owned by
   // this class, but it must remain valid for the duration of the cookie
   // monster's existence. If |store| is NULL, then no backing store will be
   // updated. If |delegate| is non-NULL, it will be notified on
   // creation/deletion of cookies.
   CookieMonster(PersistentCookieStore* store, CookieMonsterDelegate* delegate);
 
+  // Like above, but includes a non-owning pointer |channel_id_service| for the
+  // corresponding ChannelIDService used with this CookieStore.

[mattm, 2017/05/12 00:02:47]

add note about |channel_id_service| lifetime

[nharper, 2017/05/12 02:47:23]

Done.

+  CookieMonster(PersistentCookieStore* store,
+                CookieMonsterDelegate* delegate,
+                ChannelIDService* channel_id_service);
+
   // Only used during unit testing.
   CookieMonster(PersistentCookieStore* store,
                 CookieMonsterDelegate* delegate,
                 base::TimeDelta last_access_threshold);
 
   ~CookieMonster() override;
 
   // Replaces all the cookies by |list|. This method does not flush the backend.
   // This method does not support setting secure cookies, which need source
   // URLs.
@@ skipping 63 matching lines @@
   static const int kDefaultCookieableSchemesCount;
 
   std::unique_ptr<CookieChangedSubscription> AddCallbackForCookie(
       const GURL& url,
       const std::string& name,
       const CookieChangedCallback& callback) override;
 
   bool IsEphemeral() override;
 
  private:
+  CookieMonster(PersistentCookieStore* store,
+                CookieMonsterDelegate* delegate,
+                ChannelIDService* channel_id_service,
+                base::TimeDelta last_access_threshold);
+
   // For queueing the cookie monster calls.
   class CookieMonsterTask;
   template <typename Result>
   class DeleteTask;
   class DeleteAllCreatedBetweenTask;
   class DeleteAllCreatedBetweenWithPredicateTask;
   class DeleteCookieTask;
   class DeleteCanonicalCookieTask;
   class GetCookieListForURLWithOptionsTask;
   class GetAllCookiesTask;
@@ skipping 479 matching lines @@
 
   // During loading, holds the set of all loaded cookie creation times. Used to
   // avoid ever letting cookies with duplicate creation times into the store;
   // that way we don't have to worry about what sections of code are safe
   // to call while it's in that state.
   std::set<int64_t> creation_times_;
 
   std::vector<std::string> cookieable_schemes_;
 
   scoped_refptr<CookieMonsterDelegate> delegate_;
+  ChannelIDService* channel_id_service_;
 
   base::Time last_statistic_record_time_;
 
   bool persist_session_cookies_;
 
   using CookieChangedHookMap =
       std::map<std::pair<GURL, std::string>,
                std::unique_ptr<CookieChangedCallbackList>>;
   CookieChangedHookMap hook_map_;
 
@@ skipping 73 matching lines @@
   virtual ~PersistentCookieStore() {}
 
  private:
   friend class base::RefCountedThreadSafe<PersistentCookieStore>;
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_MONSTER_H_